diff --git a/core/API/DataTableGenericFilter.php b/core/API/DataTableGenericFilter.php
index cbc322f3238cb3a7c353a02e7ba63a547bd26577..769e233875f36feeb560693e2f640fc5b1ece83d 100644
--- a/core/API/DataTableGenericFilter.php
+++ b/core/API/DataTableGenericFilter.php
@@ -60,8 +60,7 @@ class Piwik_API_DataTableGenericFilter
 						),
 			'AddColumnsProcessedMetricsGoal'	=> array(
 								'filter_update_columns_when_show_all_goals'	=> array('integer'),
-								// third array element names the request variable to check
-								'filter_only_display_idgoal' => array('string', $goalsOverviewConst, 'idGoal'),
+								'idGoal' => array('string', $goalsOverviewConst),
 						),
 			'Sort' => array(
 								'filter_sort_column' 		=> array('string'),
@@ -125,7 +124,7 @@ class Piwik_API_DataTableGenericFilter
 				}
 				
 				try {
-					$value = Piwik_Common::getRequestVar($varName, $defaultValue, $type, $this->request);
+					$value = Piwik_Common::getRequestVar($name, $defaultValue, $type, $this->request);
 					settype($value, $type);
 					$filterParameters[] = $value;
 				}
diff --git a/plugins/Goals/templates/table_by_dimension.tpl b/plugins/Goals/templates/table_by_dimension.tpl
index 1b94151e3c6b5b62f48268c2b3bc95f1a6b74e93..0e3ff2b693382ebd5d88983d09453d2ecc40dc06 100644
--- a/plugins/Goals/templates/table_by_dimension.tpl
+++ b/plugins/Goals/templates/table_by_dimension.tpl
@@ -60,14 +60,13 @@ $(document).ready( function() {
 		widgetUniqueId = module+action;
 		self.expectedWidgetUniqueId = widgetUniqueId;
 		
-		var idGoal = broadcast.getValueFromHash('idGoal');
 		var widgetParameters = {
 			'module': module,
 			'action': action,
 		};
-		if (window.location.hash.indexOf('idGoal') !== -1) {
-			widgetParameters['idGoal'] = idGoal.length ? idGoal : 0;
-		}
+		var idGoal = broadcast.getValueFromHash('idGoal');
+		widgetParameters['idGoal'] = idGoal.length ? idGoal : 0; //Piwik_DataTable_Filter_AddColumnsProcessedMetricsGoal::GOALS_FULL_TABLE;
+		
 		// Loading segment table means loading Goals view for Top Countries/etc.
 		if(module != 'Goals') {
 			widgetParameters['viewDataTable'] = 'tableGoals';