diff --git a/include/layout.js b/include/layout.js
index 1e710b6a64..b11cffb7f9 100644
--- a/include/layout.js
+++ b/include/layout.js
@@ -1630,7 +1630,7 @@ function responsiveUI(event) {
 		}
 	});
 
-	$('.filterTable').each(function () {
+	$('table.filterTable').each(function () {
 		tuneFilter($(this), mainWidth);
 	});
 
@@ -3501,7 +3501,7 @@ function setSelectMenus() {
 
 	$('select.colordropdown').dropcolor();
 
-	$('select').not('.colordropdown').not('.drop-icon').not('.multi-select').not('#user_language').each(function() {
+	$('select').not('.colordropdown').not('.drop-icon').not('.multi-select').not('.graph-multiselect').not('#user_language').each(function() {
 		if ($(this).prop('multiple') != true) {
 			$(this).each(function() {
 				let id = $(this).attr('id');
@@ -3536,6 +3536,76 @@ function setSelectMenus() {
 			$(this).addClass('ui-state-default ui-corner-all');
 		}
 	});
+
+	var msWidth = 200;
+
+	$('#graph_template_id.graph-multiselect').hide().multiselect({
+		menuHeight: $(window).height()*.7,
+		menuWidth: 'auto',
+		linkInfo: faIcons,
+		buttonWidth: 'auto',
+		noneSelectedText: allSelectedText,
+		selectedText: function(numChecked, numTotal, checkedItems) {
+			myReturn = numChecked + ' ' + templatesSelected;
+
+			$.each(checkedItems, function(index, value) {
+				if (value.value == '-1') {
+					myReturn = allSelectedText;
+					return false;
+				} else if (value.value == '0') {
+					myReturn = notTemplated;
+
+					return false;
+				}
+			});
+
+			return myReturn;
+		},
+		checkAllText: allText,
+		uncheckAllText: noneText,
+		uncheckAll: function() {
+			$(this).multiselect('widget').find(':checkbox:first').each(function() {
+				$(this).prop('checked', true);
+			});
+		},
+		close: function(event, ui) {
+			applyGraphFilter();
+		},
+		open: function(event, ui) {
+			$("input[type='search']:first").focus();
+		},
+		click: function(event, ui) {
+			checked=$(this).multiselect('widget').find('input:checked').length;
+
+			if (ui.value == -1 || ui.value == 0) {
+				if (ui.checked == true) {
+					$('#graph_template_id').multiselect('uncheckAll');
+					if (ui.value == -1) {
+						$(this).multiselect('widget').find(':checkbox:first').prop('checked', true);
+					} else {
+						$(this).multiselect('widget').find(':checkbox[value="0"]').prop('checked', true);
+					}
+				}
+			} else if (checked == 0) {
+				$(this).multiselect('widget').find(':checkbox:first').each(function() {
+					$(this).click();
+				});
+			} else if ($(this).multiselect('widget').find('input:checked:first').val() == '-1') {
+				if (checked > 0) {
+					$(this).multiselect('widget').find(':checkbox:first').each(function() {
+						$(this).click();
+						$(this).prop('disable', true);
+					});
+				}
+			} else {
+				$(this).multiselect('widget').find(':checkbox[value="0"]').prop('checked', false);
+			}
+		}
+	}).multiselectfilter({
+		label: searchPlaceholder,
+		placeholder: searchEnterKeyword,
+		width: msWidth
+	});
 }
 
 function setupObjectChange() {
@@ -4038,10 +4108,6 @@ function clearGraphTimespanFilter() {
 		funcEnd: 'finalizeGraphFilter',
 	}, {
 		button_clear: 1,
-		date1: $('#date1').val(),
-		date2: $('#date2').val(),
-		predefined_timespan: $('#predefined_timespan').val(),
-		predefined_timeshift: $('#predefined_timeshift').val(),
 		__csrf_magic: csrfMagicToken
 	});
 }
@@ -4181,6 +4247,10 @@ function redrawGraph(graph_id) {
 	var myColumns  = $('#columns').val();
 	var graphRow   = $('.tableRowGraph').width();
 	var drillDown  = $('.graphDrillDown:first').outerWidth() + 10;
+	var isSource   = $('#graph_source').length ? true:false;
+	var isOrder    = $('#graph_order').length ? true:false;
+	var isCF       = $('#cf').length ? true:false;
+	var isMeasure  = $('#measure').length ? true:false;
 
 	if (mainWidth < graphRow) {
 		graphRow = mainWidth - drillDown;
@@ -4202,6 +4272,10 @@ function redrawGraph(graph_id) {
 		'&graph_height=' + graph_height +
 		'&graph_width=' + graph_width +
 		(isThumb ? '&graph_nolegend=true' : '') +
+		(isSource ? '&graph_source='+$('#graph_source').val() : '') +
+		(isOrder ? '&graph_order='+$('#graph_order').val() : '') +
+		(isCF ? '&cf='+$('#cf').val() : '') +
+		(isMeasure ? '&measure='+$('#measure').val() : '') +
 		'&business_hours=' + (isBusiness ? 'true' : 'false') +
 
 	loadUrl({
@@ -4358,6 +4432,10 @@ function initializeGraphs(disable_cache) {
 	var isBusiness = $('#business_hours').is(':checked');
 	var myWidth    = (mainWidth - (30 * myColumns)) / myColumns;
 	var numGraphs  = $('.graphWrapper').length;
+	var isSource   = $('#graph_source').length ? true:false;
+	var isOrder    = $('#graph_order').length ? true:false;
+	var isCF       = $('#cf').length ? true:false;
+	var isMeasure  = $('#measure').length ? true:false;
 
 	$('.graphWrapper').each(function () {
 		var graph_id = $(this).attr('graph_id');
@@ -4383,6 +4461,10 @@ function initializeGraphs(disable_cache) {
 			'&graph_end=' + graph_end +
 			'&graph_height=' + graph_height +
 			'&graph_width=' + graph_width +
+			(isSource ? '&graph_source='+$('#graph_source').val() : '') +
+			(isOrder ? '&graph_order='+$('#graph_order').val() : '') +
+			(isCF ? '&cf='+$('#cf').val() : '') +
+			(isMeasure ? '&measure='+$('#measure').val() : '') +
 			(disable_cache ? '&disable_cache=true' : '') +
 			(isThumb ? '&graph_nolegend=true' : '') +
 			'&business_hours=' + (isBusiness ? 'true' : 'false');
diff --git a/lib/html.php b/lib/html.php
index 0c03a591ca..89c7441591 100644
--- a/lib/html.php
+++ b/lib/html.php
@@ -2423,6 +2423,189 @@ function html_graph_tabs_right() {
 	print '</ul></nav></div>';
 }
 
+function html_transform_graph_template_ids($ids) {
+	$return_ids = array();
+
+	if (strpos($ids, ',') !== false) {
+		$ids = explode(',', $ids);
+	} else {
+		$ids = array($ids);
+	}
+
+	foreach($ids as $id) {
+		if (is_numeric($id)) {
+			$return_ids[] = $id;
+		} elseif (strpos($id, 'cg_') !== false) {
+			$new_id = str_replace('cg_', '', $id);
+			$return_ids[] = $new_id;
+		} else {
+			$id = str_replace('dq_', '', $id);
+
+			$return_ids[] = db_fetch_cell_prepared('SELECT graph_template_id
+				FROM snmp_query_graph
+				WHERE id = ?',
+				array($id));
+		}
+	}
+
+	return implode(',', $return_ids);
+}
+
+function html_graph_order_filter_array() {
+	$return  = array();
+
+	if (read_config_option('dsstats_enable') == '') {
+		$data_sources = array('-1' => __('Enable Data Source Statistics to Sort'));
+
+		$return['graph_source'] = array(
+			'method'         => 'drop_array',
+			'friendly_name'  => __('Metric'),
+			'filter'         => FILTER_CALLBACK,
+			'filter_options' => array('options' => 'sanitize_search_string'),
+			'array'          => $data_sources,
+			'value'          => '-1'
+		);
+	} else {
+		$mode = read_config_option('dsstats_mode'); // 0 - Peak/Average only, 1 - Kitchen Sink
+		$peak = read_config_option('dsstats_peak'); // '' - Average CF Only, 'on' - Average and Max CF's
+
+		if (isset_request_var('graph_template_id')) {
+			$graph_templates = get_nfilter_request_var('graph_template_id');
+
+			if (strpos($graph_templates, ',') !== false || $graph_templates == '' || $graph_templates <= 0) {
+				$show_sort    = false;
+
+				$data_sources = array('-1' => __('Select a Single Template'));
+			} else {
+				$show_sort    = true;
+
+				if (is_numeric($graph_templates)) {
+					$graph_template_id = $graph_templates;
+				} elseif (strpos($graph_templates, 'cg_') !== false) {
+					$graph_template_id = str_replace('cg_', '', $graph_templates);
+				} else {
+					$graph_template_id = db_fetch_cell_prepared('SELECT graph_template_id
+						FROM snmp_query_graph
+						WHERE id = ?',
+						array(str_replace('dq_', '', $graph_templates)));
+				}
+
+				$data_sources = array_rekey(
+					db_fetch_assoc_prepared("SELECT DISTINCT data_source_name AS graph_source
+						FROM graph_templates_item AS gti
+						INNER JOIN data_template_rrd AS dtr
+						ON dtr.id = gti.task_item_id
+						WHERE graph_template_id = ?
+						AND local_graph_id = 0
+						ORDER BY data_source_name",
+						array($graph_template_id)),
+					'graph_source', 'graph_source'
+				);
+
+				if (get_nfilter_request_var('graph_source') == '') {
+					if (cacti_sizeof($data_sources)) {
+						set_request_var('graph_source', $data_sources[0]['graph_source']);
+						set_request_var('graph_order', 'desc');
+					}
+				}
+			}
+
+			$return['graph_source'] = array(
+				'method'         => 'drop_array',
+				'friendly_name'  => __('Metric'),
+				'filter'         => FILTER_CALLBACK,
+				'filter_options' => array('options' => 'sanitize_search_string'),
+				'array'          => $data_sources,
+				'value'          => '-1'
+			);
+
+			if ($show_sort) {
+				$options = array(
+					'asc'  => __('Ascending'),
+					'desc' => __('Descending')
+				);
+
+				$return['graph_order'] = array(
+					'method'         => 'drop_array',
+					'friendly_name'  => __('Order'),
+					'filter'         => FILTER_CALLBACK,
+					'filter_options' => array('options' => 'sanitize_search_string'),
+					'default'        => 'desc',
+					'array'          => $options,
+					'value'          => 'desc'
+				);
+
+				if ($peak == 'on') {
+					$options = array(
+						'0' => __esc('Average'),
+						'1' => __esc('Maximum')
+					);
+
+					$return['cf'] = array(
+						'method'         => 'drop_array',
+						'friendly_name'  => __('CF'),
+						'filter'         => FILTER_VALIDATE_INT,
+						'default'        => 'desc',
+						'array'          => $options,
+						'value'          => get_nfilter_request_var('cf')
+					);
+				}
+
+				if ($mode == 0) {
+					$options = array(
+						'average' => __esc('Average'),
+						'peak'    => __esc('Maximum')
+					);
+
+					$return['measure'] = array(
+						'method'         => 'drop_array',
+						'friendly_name'  => __('Measure'),
+						'filter'         => FILTER_CALLBACK,
+						'filter_options' => array('options' => 'sanitize_search_string'),
+						'default'        => 'desc',
+						'array'          => $options,
+						'value'          => get_nfilter_request_var('measure')
+					);
+				} else {
+					$options = array(
+						'average' => __esc('Average'),
+						'peak'    => __esc('Maximum'),
+						'p25n'    => __esc('25th Percentile'),
+						'p50n'    => __esc('50th Percentile (Median)'),
+						'p75n'    => __esc('75th Percentile'),
+						'p90n'    => __esc('90th Percentile'),
+						'p95n'    => __esc('95th Percentile'),
+						'sum'     => __esc('Total/Sum/Bandwidth')
+					);
+
+					$return['measure'] = array(
+						'method'         => 'drop_array',
+						'friendly_name'  => __('Measure'),
+						'filter'         => FILTER_CALLBACK,
+						'filter_options' => array('options' => 'sanitize_search_string'),
+						'default'        => 'desc',
+						'array'          => $options,
+						'value'          => get_nfilter_request_var('measure')
+					);
+				}
+			}
+		} else {
+			$data_sources = array('-1' => __('Select a Single Template'));
+
+			$return['graph_source'] = array(
+				'method'         => 'drop_array',
+				'friendly_name'  => __('Metric'),
+				'filter'         => FILTER_CALLBACK,
+				'filter_options' => array('options' => 'sanitize_search_string'),
+				'array'          => $data_sources,
+				'value'          => '-1'
+			);
+		}
+	}
+
+	return $return;
+}
+
 function html_graph_order_filter() {
 	$output  = '';
 	$output .= '<td>' . __('Metric') . '</td>';
@@ -2441,6 +2624,17 @@ function html_graph_order_filter() {
 			} else {
 				$output .= '<td>';
 
+				if (is_numeric($graph_templates)) {
+					$graph_template_id = $graph_templates;
+				} elseif (strpos($graph_templates, 'cg_') !== false) {
+					$graph_template_id = str_replace('cg_', '', $graph_templates);
+				} else {
+					$graph_template_id = db_fetch_cell_prepared('SELECT graph_template_id
+						FROM snmp_query_graph
+						WHERE id = ?',
+						array(str_replace('dq_', '', $graph_templates)));
+				}
+
 				$data_sources = db_fetch_assoc_prepared("SELECT DISTINCT data_source_name AS graph_source
 					FROM graph_templates_item AS gti
 					INNER JOIN data_template_rrd AS dtr
@@ -2448,35 +2642,20 @@ function html_graph_order_filter() {
 					WHERE graph_template_id = ?
 					AND local_graph_id = 0
 					ORDER BY data_source_name",
-					array($graph_templates));
+					array($graph_template_id));
 
-				if (get_request_var('graph_source') != '') {
-					$exists = db_fetch_row_prepared("SELECT DISTINCT data_source_name
-						FROM graph_templates_item AS gti
-						INNER JOIN data_template_rrd AS dtr
-						ON dtr.id = gti.task_item_id
-						WHERE graph_template_id = ?
-						AND data_source_name = ?
-						AND local_graph_id = 0
-						LIMIT 1",
-						array($graph_templates, get_request_var('graph_source')));
-
-					if (cacti_sizeof($exists)) {
-						$exists = true;
+				if (get_request_var('graph_source') == '') {
+					if (cacti_sizeof($data_sources)) {
+						set_request_var('graph_source', $data_sources[0]['graph_source']);
+						set_request_var('graph_order', 'desc');
 					}
-				} else {
-					$exists = false;
-				}
-
-				if (!$exists) {
-					set_request_var('graph_order', 'desc');
 				}
 
 				if (cacti_sizeof($data_sources)) {
 					$output .= "<select id='graph_source' data-defaultLabel='" .  __('Sort Column') . "' onChange='applyGraphFilter()'>";
 
 					foreach($data_sources as $index => $d) {
-						if ((!$exists && $index == 0) || get_request_var('graph_source') == $d['graph_source']) {
+						if (get_request_var('graph_source') == $d['graph_source']) {
 							$selected = true;
 						} else {
 							$selected = false;
@@ -3204,6 +3383,7 @@ function html_common_header($title, $selectedTheme = '') {
 		var searchRFilter = '<?php print __esc('Enter a regular expression');?>';
 		var searchSelect = '<?php print __esc('Select to Search');?>';
 		var searchPlaceholder = '<?php print __esc('Search');?>';
+		var searchEnterKeyword = '<?php print __esc('Enter keyword');?>';
 		var sessionMessageCancel = '<?php print __esc('Cancel');?>';
 		var sessionMessageContinue = '<?php print __esc('Continue');?>';
 		var sessionMessageOk = '<?php print __esc('Ok');?>';
@@ -3222,6 +3402,11 @@ function html_common_header($title, $selectedTheme = '') {
 		var usePreferredColorTheme = '<?php print __esc('Use System Color');?>';
 		var userSettings=<?php print is_view_allowed('graph_settings') ? 'true':'false';?>;
 		var utilityView = '<?php print __esc('Utility View');?>';
+		var allSelectedText = '<?php print __('All Graphs & Templates');?>';
+		var templatesSelected = '<?php print __esc('Templates Selected');;?>';
+		var notTemplated = '<?php print __esc('Not Templated');?>';
+		var allText = '<?php __esc('All');?>';
+		var noneText = '<?php print __esc('None');?>';
 		var zoom_i18n_3rd_button = '<?php print __esc('3rd Mouse Button');?>';
 		var zoom_i18n_advanced = '<?php print __esc('Advanced');?>';
 		var zoom_i18n_auto = '<?php print __esc('Auto');?>';
diff --git a/lib/html_form.php b/lib/html_form.php
index b8b343e042..f561fae4f6 100644
--- a/lib/html_form.php
+++ b/lib/html_form.php
@@ -1240,7 +1240,7 @@ function form_multi_dropdown($form_name, $array_display, $sql_previous_values, $
 		}
 	}
 
-	$class = 'multiselect';
+	$class = "multiselect $class";
 
 	if ($class != '') {
 		$class .= " $class";
diff --git a/lib/html_graph.php b/lib/html_graph.php
index 294755da82..c3d324826e 100644
--- a/lib/html_graph.php
+++ b/lib/html_graph.php
@@ -63,7 +63,13 @@ function set_default_graph_action() {
 		'list'    => array('permission' => 'show_list',    'id' => '2'),
 	);
 
-	if (!isset_request_var('action') || get_nfilter_request_var('action') == '') {
+	if (isset_request_var('action')) {
+		$action = get_nfilter_request_var('action');
+	} else {
+		$action = '';
+	}
+
+	if ($action == '') {
 		/* setup the default action */
 		if (!isset($_SESSION['sess_graph_view_action'])) {
 
@@ -99,11 +105,11 @@ function set_default_graph_action() {
 				set_request_var('action', $_SESSION['sess_graph_view_action']);
 			}
 		}
-	} elseif (in_array(get_request_var('action'), array('get_node', 'tree_content'), true)) {
+	} elseif (in_array($action, array('get_node', 'tree_content'), true)) {
 		$_SESSION['sess_graph_view_action'] = 'tree';
-	} elseif (in_array(get_request_var('action'), array_keys($modes), true)) {
-		if (is_view_allowed('show_' . $_SESSION['sess_graph_view_action'])) {
-			$_SESSION['sess_graph_view_action'] = get_request_var('action');
+	} elseif (in_array($action, array_keys($modes), true)) {
+		if (is_view_allowed('show_' . $action)) {
+			$_SESSION['sess_graph_view_action'] = $action;
 		}
 	}
 }
@@ -913,7 +919,9 @@ function html_graph_preview_view() {
 	}
 
 	if (!isempty_request_var('graph_template_id') && get_request_var('graph_template_id') != '-1' && get_request_var('graph_template_id') != '0') {
-		$sql_where .= ($sql_where != '' ? ' AND ':'') . ' (gl.graph_template_id IN (' . get_request_var('graph_template_id') . '))';
+		$graph_templates = html_transform_graph_template_ids(get_request_var('graph_template_id'));
+
+		$sql_where .= ($sql_where != '' ? ' AND ':'') . ' (gl.graph_template_id IN (' . $graph_templates . '))';
 	} elseif (get_request_var('graph_template_id') == '0') {
 		$sql_where .= ($sql_where != '' ? ' AND ':'') . ' (gl.graph_template_id IN (' . get_request_var('graph_template_id') . '))';
 	}
@@ -1226,7 +1234,9 @@ function html_graph_list_view() {
 	}
 
 	if (!isempty_request_var('graph_template_id') && get_request_var('graph_template_id') != '-1' && get_request_var('graph_template_id') != '0') {
-		$sql_where .= ($sql_where != '' ? ' AND ':'') . ' (gl.graph_template_id IN (' . get_request_var('graph_template_id') . '))';
+		$graph_templates = html_transform_graph_template_ids(get_request_var('graph_template_id'));
+
+		$sql_where .= ($sql_where != '' ? ' AND ':'') . ' (gl.graph_template_id IN (' . $graph_templates . '))';
 	} elseif (get_request_var('graph_template_id') == '0') {
 		$sql_where .= ($sql_where != '' ? ' AND ':'') . ' (gl.graph_template_id IN (' . get_request_var('graph_template_id') . '))';
 	}
diff --git a/lib/html_tree.php b/lib/html_tree.php
index 07f18335df..969063ed52 100644
--- a/lib/html_tree.php
+++ b/lib/html_tree.php
@@ -113,7 +113,7 @@ function grow_dhtml_trees() {
 
 	include_once(CACTI_PATH_LIBRARY . '/data_query.php');
 
-	html_validate_tree_vars();
+	process_sanitize_draw_tree_filter();
 
 	$default_tree_id = read_user_setting('default_tree_id');
 
@@ -949,22 +949,8 @@ function create_dhtml_tree() {
 	return $dhtml_tree;
 }
 
-/**
- * Validates and processes tree-related request variables.
- *
- * This function ensures that the request variables related to tree views are
- * properly validated and sanitized. It also handles session storage for these
- * variables and prevents double calls within the same stack.
- *
- * @return bool Returns false if the function has already been called in the same stack.
- */
-function html_validate_tree_vars() {
-	static $count = false;
-
-	// prevent double calls in the same stack
-	if ($count) {
-		return false;
-	}
+function create_tree_filter() {
+	global $item_rows;
 
 	/* unset the ordering if we have a setup that does not support ordering */
 	if (isset_request_var('graph_template_id')) {
@@ -982,99 +968,189 @@ function html_validate_tree_vars() {
 		}
 	}
 
-	/* ================= input validation and session storage ================= */
+	$all     = array('-1' => __('All'));
+	$any     = array('-1' => __('Any'));
+	$none    = array('0'  => __('None'));
+
+	if (get_filter_request_var('host_id') == 0) {
+		$templates = get_allowed_graph_templates_normalized('gl.host_id=0', 'name', '', $total_rows);
+	} elseif (get_filter_request_var('host_id') > 0) {
+		$templates = get_allowed_graph_templates_normalized('gl.host_id=' . get_filter_request_var('host_id'), 'name', '', $total_rows);
+	} else {
+		$templates = get_allowed_graph_templates_normalized('', 'name', '', $total_rows);
+	}
+
+	$normalized_templates = array();
+	if (cacti_sizeof($templates)) {
+		foreach($templates as $t) {
+			$normalized_templates[$t['id']] = $t['name'];
+		}
+	}
+
+	$columns = array(
+		'1' => __('%d Column', 1),
+		'2' => __('%d Columns', 2),
+		'3' => __('%d Columns', 3),
+		'4' => __('%d Columns', 4),
+		'5' => __('%d Columns', 5),
+		'6' => __('%d Columns', 6)
+	);
+
+	$normalized_templates = $all + $none + $normalized_templates;
+
+	$metrics_array = html_graph_order_filter_array();
+
 	$filters = array(
-		'graphs' => array(
-			'filter'  => FILTER_VALIDATE_INT,
-			'pageset' => true,
-			'default' => read_user_setting('treeview_graphs_per_page')
-		),
-		'graph_template_id' => array(
-			'filter'  => FILTER_VALIDATE_IS_NUMERIC_LIST,
-			'pageset' => true,
-			'default' => '-1'
-		),
-		'graph_source' => array(
-			'filter'  => FILTER_CALLBACK,
-			'default' => '',
-			'options' => array('options' => 'sanitize_search_string')
-		),
-		'graph_order' => array(
-			'filter'  => FILTER_VALIDATE_REGEXP,
-			'options' => array('options' => array('regexp' => '(asc|desc)')),
-			'default' => 'desc'
-		),
-		'cf' => array(
-			'filter'  => FILTER_VALIDATE_INT,
-			'default' => '0'
-		),
-		'measure' => array(
-			'filter'  => FILTER_CALLBACK,
-			'default' => 'average',
-			'options' => array('options' => 'sanitize_search_string')
-		),
-		'columns' => array(
-			'filter'  => FILTER_VALIDATE_INT,
-			'default' => read_user_setting('num_columns_tree', '2')
-		),
-		'page' => array(
-			'filter'  => FILTER_VALIDATE_INT,
-			'default' => '1'
-		),
-		'predefined_timeshift' => array(
-			'filter'  => FILTER_VALIDATE_INT,
-			'default' => read_user_setting('default_timeshift')
-		),
-		'predefined_timespan' => array(
-			'filter'  => FILTER_VALIDATE_INT,
-			'default' => read_user_setting('default_timespan')
-		),
-		'node' => array(
-			'filter'  => FILTER_VALIDATE_REGEXP,
-			'options' => array('options' => array('regexp' => '/([_\-a-z:0-9#]+)/')),
-			'pageset' => true,
-			'default' => ''
-		),
-		'site_id' => array(
-			'filter'  => FILTER_VALIDATE_INT,
-			'default' => '-1'
-		),
-		'host_id' => array(
-			'filter'  => FILTER_VALIDATE_INT,
-			'default' => '-1'
-		),
-		'host_template_id' => array(
-			'filter'  => FILTER_VALIDATE_INT,
-			'default' => '-1'
-		),
-		'hgd' => array(
-			'filter'  => FILTER_CALLBACK,
-			'pageset' => true,
-			'default' => '',
-			'options' => array('options' => 'sanitize_search_string')
-		),
-		'rfilter' => array(
-			'filter'  => FILTER_VALIDATE_IS_REGEX,
-			'pageset' => true,
-			'default' => '',
+		'options' => array(
+			'change_function' => 'applyGraphFilter()',
+			'clear_function'  => 'clearGraphFilter()',
+			'save_function'   => 'saveGraphFilter()'
 		),
-		'thumbnails' => array(
-			'filter'  => FILTER_VALIDATE_REGEXP,
-			'options' => array('options' => array('regexp' => '(true|false)')),
-			'pageset' => true,
-			'default' => read_user_setting('thumbnail_section_tree_2') == 'on' ? 'true':'false'
+		'rows' => array(
+			array(
+				'rfilter' => array(
+					'method'        => 'textbox',
+					'friendly_name'  => __('Search'),
+					'filter'         => FILTER_VALIDATE_IS_REGEX,
+					'placeholder'    => __('Enter a search term'),
+					'size'           => '55',
+					'default'        => '',
+					'pageset'        => true,
+					'max_length'     => '120',
+					'value'          => ''
+				)
+			),
+			array(
+				'graph_template_id' => array(
+					'method'         => 'drop_multi',
+					'friendly_name'  => __('Templates'),
+					'filter'         => FILTER_VALIDATE_REGEXP,
+					'filter_options' => array('options' => array('regexp' => '(cg_[0-9]|dq_[0-9]|[\-0-9])')),
+					'default'        => '-1',
+					'dynamic'        => false,
+					'class'          => 'graph-multiselect',
+					'pageset'        => true,
+					'array'          => $normalized_templates,
+					'value'          => get_nfilter_request_var('graph_template_id')
+				),
+			),
+			array(
+				'graphs' => array(
+					'method'        => 'drop_array',
+					'friendly_name' => __('Graphs'),
+					'filter'        => FILTER_VALIDATE_INT,
+					'default'       => read_user_setting('treeview_graphs_per_page', 4),
+					'pageset'       => true,
+					'array'         => $item_rows,
+					'value'         => read_user_setting('treeview_graphs_per_page', 4)
+				),
+				'columns' => array(
+					'method'        => 'drop_array',
+					'friendly_name' => __('Columns'),
+					'filter'        => FILTER_VALIDATE_INT,
+					'default'       => read_user_setting('num_columns_tree', '2'),
+					'pageset'       => true,
+					'array'         => $columns,
+					'value'         => read_user_setting('num_columns_tree', '2')
+				),
+				'thumbnails' => array(
+					'method'         => 'filter_checkbox',
+					'friendly_name'  => __('Thumbnails'),
+					'filter'         => FILTER_VALIDATE_REGEXP,
+					'filter_options' => array('options' => array('regexp' => '(true|false)')),
+					'default'        => '',
+					'value'          => get_nfilter_request_var('thumbnails')
+				),
+				'business_hours' => array(
+					'method'         => 'filter_checkbox',
+					'friendly_name'  => __('Business Hours'),
+					'filter'         => FILTER_VALIDATE_REGEXP,
+					'filter_options' => array('options' => array('regexp' => '(true|false)')),
+					'default'        => '',
+					'value'          => get_nfilter_request_var('business_hours')
+				)
+			),
+			array(
+				'timespan' => array(
+					'method'         => 'timespan',
+					'refresh'        => true,
+					'clear'          => true,
+					'shifter'        => true,
+				),
+				'node' => array(
+					'method'         => 'validate',
+					'filter'         => FILTER_VALIDATE_REGEXP,
+					'filter_options' => array('options' => array('regexp' => '/([_\-a-z:0-9#]+)/')),
+					'pageset'        => true,
+					'default'        => ''
+				),
+				'site_id' => array(
+					'method'         => 'validate',
+					'filter'         => FILTER_VALIDATE_INT,
+					'default'        => '-1'
+				),
+				'host_id' => array(
+					'method'         => 'validate',
+					'filter'         => FILTER_VALIDATE_INT,
+					'default'        => '-1'
+				),
+				'host_template_id'   => array(
+					'method'         => 'validate',
+					'filter'         => FILTER_VALIDATE_INT,
+					'default'        => '-1'
+				),
+				'hgd' => array(
+					'method'         => 'validate',
+					'filter'         => FILTER_CALLBACK,
+					'filter_options' => array('options' => 'sanitize_search_string'),
+					'pageset'        => true,
+					'default'        => '',
+				),
+			)
 		),
-		'business_hours' => array(
-			'filter'  => FILTER_VALIDATE_REGEXP,
-			'options' => array('options' => array('regexp' => '(true|false)')),
-			'default' => read_user_setting('show_business_hours', '') == 'on' ? 'true':'false'
+		'buttons' => array(
+			'go' => array(
+				'method'  => 'submit',
+				'display' => __('Go'),
+				'title'   => __('Apply filter to table'),
+			),
+			'clear' => array(
+				'method'  => 'button',
+				'display' => __('Clear'),
+				'title'   => __('Reset filter to default values'),
+			)
 		)
 	);
 
-	validate_store_request_vars($filters, 'sess_grt');
-	/* ================= input validation ================= */
+	if (cacti_sizeof($metrics_array)) {
+		$filters['rows'][1] += $metrics_array;
+	}
+
+	if (is_view_allowed('graph_settings')) {
+		$filters['button']['save'] = array(
+			'method'  => 'button',
+			'display' => __('Save'),
+			'title'   => __('Save filter to the database'),
+		);
+	}
+
+	return $filters;
+}
+
+function process_sanitize_draw_tree_filter($render = false) {
+	$header = __('Graph Filters') . (get_nfilter_request_var('rfilter') != '' ? ' [ ' . __('Filter') . " '" . html_escape_request_var('rfilter') . "' " . __('Applied') . ' ]' : '');
+
+	/* create the page filter */
+	$filters    = create_tree_filter();
+	$pageFilter = new CactiTableFilter($header, 'graph_view.php', 'form_graph_view', 'sess_tview');
+	$pageFilter->rows_label = __('Graphs');
+	$pageFilter->set_filter_array($filters);
 
-	$count = true;
+	if ($render) {
+		$pageFilter->render();
+	} else {
+		$pageFilter->sanitize();
+	}
 }
 
 /**
@@ -1101,6 +1177,8 @@ function grow_right_pane_tree($tree_id, $leaf_id, $host_group_data) {
 		return;
 	}
 
+	process_sanitize_draw_tree_filter(true);
+
 	if (empty($leaf_id)) {
 		$leaf_id = 0;
 	}
@@ -1168,21 +1246,21 @@ function grow_right_pane_tree($tree_id, $leaf_id, $host_group_data) {
 			array($leaf['site_id']));
 	}
 
-	if (isset_request_var('host_id') && get_request_var('host_id') > 0 && $host_name == '') {
+	if (isset_request_var('host_id') && get_filter_request_var('host_id') > 0 && $host_name == '') {
 		$host_name = db_fetch_cell_prepared('SELECT description
 			FROM host
 			WHERE id = ?',
 			array(get_request_var('host_id')));
 	}
 
-	if (isset_request_var('site_id') && get_request_var('site_id') > 0 && $site_name == '') {
+	if (isset_request_var('site_id') && get_filter_request_var('site_id') > 0 && $site_name == '') {
 		$site_name = db_fetch_cell_prepared('SELECT name
 			FROM sites
 			WHERE id = ?',
 			array(get_request_var('site_id')));
 	}
 
-	if (isset_request_var('host_template_id') && get_request_var('host_template_id') > 0) {
+	if (isset_request_var('host_template_id') && get_filter_request_var('host_template_id') > 0) {
 		$host_template_name = db_fetch_cell_prepared('SELECT name
 			FROM host_template
 			WHERE id = ?',
@@ -1250,226 +1328,11 @@ function grow_right_pane_tree($tree_id, $leaf_id, $host_group_data) {
 		$title_delimiter = ' > ';
 	}
 
-	html_start_box(__('Graph Filters') . (get_request_var('rfilter') != '' ? ' [ ' . __('Filter') . " '" . html_escape_request_var('rfilter') . "' " . __('Applied') . ' ]' : ''), '100%', '', '3', 'center', '');
-
-	?>
-	<tr class='even noprint' id='search'>
-		<td class='noprint'>
-		<form id='form_graph_view' method='post' onSubmit='applyGraphFilter();return false'>
-			<table class='filterTable'>
-				<tr>
-					<td>
-						<?php print __('Search');?>
-					</td>
-					<td>
-						<input type='text' class='ui-state-default ui-corner-all' id='rfilter' size='55' value='<?php print html_escape_request_var('rfilter');?>'>
-					</td>
-				</td>
-				<td>
-					<span>
-						<input type='submit' class='ui-button ui-corner-all ui-widget' id='go' value='<?php print __esc('Go');?>' title='<?php print __esc('Set/Refresh Filter');?>'>
-						<input type='button' class='ui-button ui-corner-all ui-widget' id='clear' value='<?php print __esc('Clear');?>' title='<?php print __esc('Clear Filters');?>'>
-						<?php if (is_view_allowed('graph_settings')) {?>
-						<input type='button' class='ui-button ui-corner-all ui-widget' id='save' value='<?php print __esc('Save');?>' title='<?php print __esc('Save the current Graphs, Columns, Thumbnail, Preset, and Timeshift preferences to your profile');?>'>
-						<?php }?>
-					</span>
-				</td>
-				<td id='text'></td>
-			</table>
-			<table class='filterTable'>
-				<tr>
-					<td>
-						<?php print __('Template');?>
-					</td>
-					<td>
-						<select id='graph_template_id' class='multi-select'>
-							<option value='-1'<?php if (get_request_var('graph_template_id') == '-1') {?> selected<?php }?>><?php print __('All Graphs & Templates');?></option>
-							<option value='0'<?php if (get_request_var('graph_template_id') == '0') {?> selected<?php }?>><?php print __('Not Templated');?></option>
-							<?php
-							// suppress total rows collection
-							$total_rows = -1;
-
-							$graph_templates = get_allowed_graph_templates('', 'name', '', $total_rows);
-
-							if (cacti_sizeof($graph_templates)) {
-								$selected = explode(',', get_request_var('graph_template_id'));
-
-								foreach ($graph_templates as $gt) {
-									$exists = db_fetch_cell_prepared('SELECT id
-										FROM graph_local
-										WHERE graph_template_id = ? LIMIT 1',
-										array($gt['id']));
-
-									if ($exists) {
-										$found = false;
-
-										foreach($selected as $id) {
-											if ($id == $gt['id']) {
-												$found = true;
-												break;
-											}
-										}
-
-										print "<option value='{$gt['id']}'" . ($found ? ' selected':'') . '>' . html_escape($gt['name']) . '</option>';
-									}
-								}
-							}
-							?>
-						</select>
-					</td>
-					<?php print html_graph_order_filter();?>
-				</tr>
-			</table>
-			<table class='filterTable'>
-				<tr>
-					<td>
-						<?php print __('Graphs');?>
-					</td>
-					<td>
-						<select id='graphs' onChange='applyGraphFilter()'>
-							<?php
-							if (cacti_sizeof($graphs_per_page)) {
-								foreach ($graphs_per_page as $key => $value) {
-									print "<option value='$key'" . (get_request_var('graphs') == $key ? ' selected':'') . '>' . $value . '</option>';
-								}
-							}
-							?>
-						</select>
-					</td>
-					<td>
-						<?php print __('Columns');?>
-					</td>
-					<td>
-						<select id='columns' onChange='applyGraphFilter()'>
-							<option value='1' <?php print(get_request_var('columns') == '1' ? ' selected':'');?>><?php print __('%d Column', 1);?></option>
-							<option value='2' <?php print(get_request_var('columns') == '2' ? ' selected':'');?>><?php print __('%d Columns', 2);?></option>
-							<option value='3' <?php print(get_request_var('columns') == '3' ? ' selected':'');?>><?php print __('%d Columns', 3);?></option>
-							<option value='4' <?php print(get_request_var('columns') == '4' ? ' selected':'');?>><?php print __('%d Columns', 4);?></option>
-							<option value='5' <?php print(get_request_var('columns') == '5' ? ' selected':'');?>><?php print __('%d Columns', 5);?></option>
-							<option value='6' <?php print(get_request_var('columns') == '6' ? ' selected':'');?>><?php print __('%d Columns', 6);?></option>
-						</select>
-					</td>
-					<td>
-						<span>
-							<?php print html_thumbnails_filter();?>
-							<?php print html_business_hours_filter();?>
-						</span>
-					</td>
-				</tr>
-			</table>
-		</form>
-		</td>
-	</tr>
-	<tr class='even noprint'>
-		<td class='noprint'>
-		<form name='form_timespan_selector' method='post' action='<?php print CACTI_PATH_URL;?>graph_view.php'>
-			<table class='filterTable'>
-				<tr id='timespan'>
-					<td>
-						<?php print __('Presets');?>
-					</td>
-					<td>
-						<select id='predefined_timespan' onChange='applyGraphTimespan()'>
-							<?php
-							$graph_timespans = array_merge(array(GT_CUSTOM => __('Custom')), $graph_timespans);
-
-							$start_val = 0;
-							$end_val   = cacti_sizeof($graph_timespans);
-
-							if (cacti_sizeof($graph_timespans)) {
-								foreach ($graph_timespans as $value => $text) {
-									print "<option value='$value'" . ($_SESSION['sess_current_timespan'] == $value ? ' selected':'') .  '>' . html_escape($text) . '</option>';
-								}
-							}
-							?>
-						</select>
-					</td>
-					<td>
-						<?php print __('From');?>
-					</td>
-					<td>
-						<span>
-							<input type='text' class='ui-state-default ui-corner-all' id='date1' size='18' value='<?php print(isset($_SESSION['sess_current_date1']) ? $_SESSION['sess_current_date1'] : '');?>'>
-							<i id='startDate' class='calendar fa fa-calendar-alt' title='<?php print __esc('Start Date Selector');?>'></i>
-						</span>
-					</td>
-					<td>
-						<?php print __('To');?>
-					</td>
-					<td>
-						<span>
-							<input type='text' class='ui-state-default ui-corner-all' id='date2' size='18' value='<?php print(isset($_SESSION['sess_current_date2']) ? $_SESSION['sess_current_date2'] : '');?>'>
-							<i id='endDate' class='calendar fa fa-calendar-alt' title='<?php print __esc('End Date Selector');?>'></i>
-						</span>
-					</td>
-					<td>
-						<span>
-							<i class='shiftArrow fa fa-backward' onClick='timeshiftGraphFilterLeft()' title='<?php print __esc('Shift Time Backward');?>'></i>
-							<select id='predefined_timeshift' title='<?php print __esc('Define Shifting Interval');?>'>
-								<?php
-								$start_val = 1;
-							$end_val    = cacti_sizeof($graph_timeshifts) + 1;
-
-							if (cacti_sizeof($graph_timeshifts)) {
-								for ($shift_value=$start_val; $shift_value < $end_val; $shift_value++) {
-									print "<option value='$shift_value'" . ($_SESSION['sess_current_timeshift'] == $shift_value ? ' selected':'') . '>' . html_escape($graph_timeshifts[$shift_value]) . '</option>';
-								}
-							}
-							?>
-							</select>
-							<i class='shiftArrow fa fa-forward' onClick='timeshiftGraphFilterRight()' title='<?php print __esc('Shift Time Forward');?>'></i>
-						</span>
-					</td>
-					<td>
-						<span>
-							<input type='button' class='ui-button ui-corner-all ui-widget' id='tsrefresh' value='<?php print __esc('Refresh');?>' title='<?php print __esc('Refresh selected time span');?>' onClick='refreshGraphTimespanFilter()'>
-							<input type='button' class='ui-button ui-corner-all ui-widget' id='tsclear' value='<?php print __esc('Clear');?>' title='<?php print __esc('Return to the default time span');?>' onClick='clearGraphTimespanFilter()'>
-						</span>
-					</td>
-				</tr>
-			</table>
-			<table class='filterTable'>
-				<tr id='realtime' style='display:none;'>
-					<td>
-						<?php print __('Window');?>
-					</td>
-					<td>
-						<select id='graph_start' onChange='realtimeGrapher()'>
-							<?php
-							foreach ($realtime_window as $interval => $text) {
-								printf('<option value="%d"%s>%s</option>', $interval, $interval == $_SESSION['sess_realtime_window'] ? ' selected="selected"' : '', $text);
-							}
-							?>
-						</select>
-					</td>
-					<td>
-						<?php print __('Refresh');?>
-					</td>
-					<td>
-						<select id='ds_step' onChange="realtimeGrapher()">
-							<?php
-							foreach ($realtime_refresh as $interval => $text) {
-								printf('<option value="%d"%s>%s</option>', $interval, $interval == $_SESSION['sess_realtime_dsstep'] ? ' selected="selected"' : '', $text);
-							}
-							?>
-						</select>
-					</td>
-					<td>
-						<input type='button' class='ui-button ui-corner-all ui-widget' id='realtimeoff' value='<?php print __esc('Stop');?>'>
-					</td>
-					<td class='center' colspan='6'>
-						<span id='countdown'></span>
-					</td>
-					<td>
-						<input id='future' type='hidden' value='<?php print read_config_option('allow_graph_dates_in_future');?>'></input>
-					</td>
-				</tr>
-			</table>
-		</form>
-		</td>
-	</tr><?php
-
-	html_end_box();
+	if (get_request_var('graphs') == '-1') {
+		$graph_rows = read_user_setting('treeview_graphs_per_page', 4);
+	} else {
+		$graph_rows = get_request_var('graphs');
+	}
 
 	?>
 	<script type='text/javascript'>
@@ -1484,8 +1347,6 @@ function grow_right_pane_tree($tree_id, $leaf_id, $host_group_data) {
 	var date2Open   = false;
 
 	function initPage() {
-		<?php html_graph_template_multiselect();?>
-
 		$('#startDate').click(function() {
 			if (date1Open) {
 				date1Open = false;
@@ -1577,8 +1438,10 @@ function initPage() {
 			$sql_where .= " (gtg.title_cache RLIKE '" . get_request_var('rfilter') . "' OR gtg.title RLIKE '" . get_request_var('rfilter') . "')";
 		}
 
-		if (isset_request_var('graph_template_id') && get_request_var('graph_template_id') >= 0) {
-			$sql_where .= ($sql_where != '' ? ' AND ':'') . ' (gl.graph_template_id IN (' . get_request_var('graph_template_id') . '))';
+		if (isset_request_var('graph_template_id') && get_request_var('graph_template_id') != '') {
+			$graph_templates = html_transform_graph_template_ids(get_request_var('graph_template_id'));
+
+			$sql_where .= ($sql_where != '' ? ' AND ':'') . ' (gl.graph_template_id IN (' . $graph_templates. '))';
 		}
 
 		$graph_list = get_allowed_tree_header_graphs($tree_id, $leaf_id, $sql_where);
@@ -1633,8 +1496,10 @@ function initPage() {
 			$sql_where .= ($sql_where != '' ? ' AND ':'') . "(gtg.title_cache RLIKE '" . get_request_var('rfilter') . "')";
 		}
 
-		if (isset_request_var('graph_template_id') && get_request_var('graph_template_id') >= 0) {
-			$sql_where .= ($sql_where != '' ? ' AND ':'') . '(gl.graph_template_id IN (' . get_request_var('graph_template_id') . '))';
+		if (isset_request_var('graph_template_id') && get_request_var('graph_template_id') != '') {
+			$graph_templates = html_transform_graph_template_ids(get_request_var('graph_template_id'));
+
+			$sql_where .= ($sql_where != '' ? ' AND ':'') . '(gl.graph_template_id IN (' . $graph_template_id . '))';
 		}
 
 		if (read_config_option('dsstats_enable') == 'on' && get_request_var('graph_source') != '' && get_request_var('graph_order') != '') {
@@ -1673,7 +1538,7 @@ function initPage() {
 	$total_rows = cacti_sizeof($graph_list);
 
 	/* generate page list */
-	$nav = html_nav_bar(CACTI_PATH_URL . 'graph_view.php?action=tree_content&tree_id=' . $tree_id . '&leaf_id=' . $leaf_id . '&node=' . get_request_var('node') . '&hgd=' . $host_group_data, MAX_DISPLAY_PAGES, get_request_var('page'), get_request_var('graphs'), $total_rows, get_request_var('columns'), __('Graphs'), 'page', 'main');
+	$nav = html_nav_bar(CACTI_PATH_URL . 'graph_view.php?action=tree_content&tree_id=' . $tree_id . '&leaf_id=' . $leaf_id . '&node=' . get_request_var('node') . '&hgd=' . $host_group_data, MAX_DISPLAY_PAGES, get_request_var('page'), $graph_rows, $total_rows, get_request_var('columns'), __('Graphs'), 'page', 'main');
 
 	print $nav;
 
@@ -1682,9 +1547,9 @@ function initPage() {
 	/* start graph display */
 	print "<div class='tableHeader tableRowGraph left'>$title</div>";
 
-	$i = get_request_var('graphs') * (get_request_var('page') - 1);
+	$i = $graph_rows * (get_request_var('page') - 1);
 
-	$last_graph = $i + get_request_var('graphs');
+	$last_graph = $i + $graph_rows;
 
 	$new_graph_list = array();
 
@@ -1733,6 +1598,8 @@ function get_host_graph_list($host_id, $graph_template_id, $data_query_id, $host
 			$sql_where = 'gl.host_id=' . $host_id;
 		}
 
+		$graph_template_id = html_transform_graph_template_ids($graph_template_id);
+
 		if ($graph_template_id != '' && $graph_template_id != '-1' && $graph_template_id != '0') {
 			$sql_where .= ($sql_where != '' ? ' AND ':'') . ' (gl.graph_template_id IN (' . $graph_template_id . '))';
 		} elseif ($graph_template_id == 0) {
@@ -1742,7 +1609,8 @@ function get_host_graph_list($host_id, $graph_template_id, $data_query_id, $host
 		// suppress total rows collection
 		$total_rows = -1;
 
-		$graph_templates = get_allowed_graph_templates('', 'name', '', $total_rows);
+		$graph_templates = get_allowed_graph_templates($sql_where, 'name', '', $total_rows);
+
 		$final_templates = array();
 
 		if ($graph_template_id != '' && $graph_template_id != '-1' && $graph_template_id != '0') {
@@ -1776,11 +1644,11 @@ function get_host_graph_list($host_id, $graph_template_id, $data_query_id, $host
 			$sql_where = '';
 
 			if (get_request_var('rfilter') != '') {
-				$sql_where = " (gtg.title_cache RLIKE '" . get_request_var('rfilter') . "')";
+				$sql_where   .= " (gtg.title_cache RLIKE '" . get_request_var('rfilter') . "')";
 			}
 
 			if ($host_id > 0) {
-				$sql_where .= ($sql_where != '' ? ' AND ':'') . 'gl.host_id=' . $host_id;
+				$sql_where .= ($sql_where != '' ? ' AND ':'') . 'gl.host_id = ' . $host_id;
 			}
 
 			$graph_template_ids = array();
@@ -1791,7 +1659,7 @@ function get_host_graph_list($host_id, $graph_template_id, $data_query_id, $host
 
 			$sql_where .= ($sql_where != '' ? ' AND ':'') . 'gl.graph_template_id IN (' . implode(', ', $graph_template_ids) . ')';
 
-			if (read_config_option('dsstats_enable') == 'on' && get_request_var('graph_source') != '' && get_request_var('graph_order') != '') {
+			if (get_request_var('graph_source') != '-1' && read_config_option('dsstats_enable') == 'on' && get_request_var('graph_source') != '' && get_request_var('graph_order') != '') {
 				$sql_order = array(
 					'data_source' => get_request_var('graph_source'),
 					'order'       => get_request_var('graph_order'),
@@ -2041,7 +1909,7 @@ function get_matching_nodes() {
 }
 
 function html_tree_init() {
-	html_validate_tree_vars();
+	process_sanitize_draw_tree_filter();
 
 	if (isset_request_var('tree_id')) {
 		$_SESSION['sess_tree_id'] = get_filter_request_var('tree_id');
@@ -2111,7 +1979,7 @@ function html_tree_get_node() {
 }
 
 function html_tree_get_content() {
-	html_validate_tree_vars();
+	process_sanitize_draw_tree_filter();
 
 	top_graph_header();
 
@@ -2188,7 +2056,7 @@ function html_tree_get_content() {
 	}
 
 	if (isset_request_var('hgd')) {
-		$hgdata = get_request_var('hgd');
+		$hgdata = get_nfilter_request_var('hgd');
 	}
 
 	if ($tree_id > 0) {