diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php
index 0b14549e173c3e3c1227dbaf676ddfa7bff861ec..831b03ba429d275d4eff33d6dfeee223fb53cbd3 100644
--- a/plugins/Actions/API.php
+++ b/plugins/Actions/API.php
@@ -277,7 +277,7 @@ class Piwik_Actions_API
 		$dataTable->filter('ColumnCallbackDeleteRow',
 			array(
 				Piwik_Archive::INDEX_SITE_SEARCH_HAS_NO_RESULT,
-				create_function ( '$value', 'return $value == 1;')
+				create_function ( '$value', 'return $value >= 1;')
 			));
 		$dataTable->deleteColumn(Piwik_Archive::INDEX_SITE_SEARCH_HAS_NO_RESULT);
 		$this->filterPageDatatable($dataTable);
diff --git a/plugins/Actions/Archiving.php b/plugins/Actions/Archiving.php
index b9717015cee95af47006c7435f5e502b992a1864..0a89d5b26e699db8435dcf5844e8062a6efc3bd0 100644
--- a/plugins/Actions/Archiving.php
+++ b/plugins/Actions/Archiving.php
@@ -376,6 +376,7 @@ class Piwik_Actions_Archiving
 
 		$dataTable = $this->actionsTablesByType[Piwik_Tracker_Action::TYPE_SITE_SEARCH];
 		self::deleteInvalidSummedColumnsFromDataTable($dataTable);
+		$this->deleteUnusedColumnsFromKeywordsDataTable($dataTable);
 		$s = $dataTable->getSerialized( Piwik_Actions_ArchivingHelper::$maximumRowsInDataTableLevelZero, Piwik_Actions_ArchivingHelper::$maximumRowsInSubDataTable, Piwik_Actions_ArchivingHelper::$columnToSortByBeforeTruncation );
 		$archiveProcessing->insertBlobRecord('Actions_sitesearch', $s);
 		$archiveProcessing->insertNumericRecord('Actions_nb_searches', array_sum($dataTable->getColumn(Piwik_Archive::INDEX_NB_VISITS)));
@@ -385,6 +386,21 @@ class Piwik_Actions_Archiving
 		destroy($this->actionsTablesByType);
 	}
 
+	protected function deleteUnusedColumnsFromKeywordsDataTable($dataTable)
+	{
+		$columnsToDelete = array(
+			Piwik_Archive::INDEX_NB_UNIQ_VISITORS,
+			Piwik_Archive::INDEX_PAGE_IS_FOLLOWING_SITE_SEARCH_NB_HITS,
+			Piwik_Archive::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS,
+			Piwik_Archive::INDEX_PAGE_ENTRY_NB_ACTIONS,
+			Piwik_Archive::INDEX_PAGE_ENTRY_SUM_VISIT_LENGTH,
+			Piwik_Archive::INDEX_PAGE_ENTRY_NB_VISITS,
+			Piwik_Archive::INDEX_PAGE_ENTRY_BOUNCE_COUNT,
+			Piwik_Archive::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS,
+		);
+		$dataTable->deleteColumns($columnsToDelete);
+	}
+
 	static protected function removeEmptyColumns($dataTable)
 	{
 		// Delete all columns that have a value of zero
diff --git a/tests/PHPUnit/Integration/SiteSearchTest.php b/tests/PHPUnit/Integration/SiteSearchTest.php
index b94328b072da3c887c53cd12128a7e0fb25d99ad..88dc822f0829d1139481f66ce3884fb4911177af 100755
--- a/tests/PHPUnit/Integration/SiteSearchTest.php
+++ b/tests/PHPUnit/Integration/SiteSearchTest.php
@@ -148,6 +148,8 @@ class Test_Piwik_Integration_SiteSearch extends IntegrationTestCase
 		$visitor->setUrl('http://example.org/index.htm#q=Search 1&search_count=10');
 		self::checkResponse($visitor->doTrackPageView('Site Search results - URL Fragment'));
 
+		// &search_count=0 so it's a "No Result" keyword, but it will not appear in the report, because it also has other seraches with results
+		// and the archiving does a MAX()
 		$visitor->setForceVisitDateTime(Piwik_Date::factory(self::$dateTime)->addHour(0.27)->getDatetime());
 		$visitor->setUrl('http://example.org/index.htm?hello=world#q=Search 1&search_count=0');
 		self::checkResponse($visitor->doTrackPageView('Site Search results - URL Fragment'));
diff --git a/tests/integration/expected/test_SiteSearch_Actions.getSiteSearchNoResultKeywords_firstSite_lastN__API.getProcessedReport_month.xml b/tests/integration/expected/test_SiteSearch_Actions.getSiteSearchNoResultKeywords_firstSite_lastN__API.getProcessedReport_month.xml
index c702150c45496575a5b52be84e9133279ba6b0b7..622613da9f1978aeb2c540523e358c0195976796 100644
--- a/tests/integration/expected/test_SiteSearch_Actions.getSiteSearchNoResultKeywords_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/integration/expected/test_SiteSearch_Actions.getSiteSearchNoResultKeywords_firstSite_lastN__API.getProcessedReport_month.xml
@@ -31,7 +31,13 @@
 
 	</columns>
 	<reportData>
-		<result prettyDate="2010, January" />
+		<result prettyDate="2010, January">
+			<row>
+				<label>No Result Keyword!</label>
+				<nb_visits>2</nb_visits>
+				<exit_rate>0%</exit_rate>
+			</row>
+		</result>
 		<result prettyDate="2010, February" />
 		<result prettyDate="2010, March" />
 		<result prettyDate="2010, April" />
diff --git a/tests/integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml b/tests/integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml
index 48b6a72616ed8837d9734554b507cb42cd69cd1f..b8c3766f2e0590094286b0ce519be51e63da7042 100644
--- a/tests/integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml
+++ b/tests/integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml
@@ -5,15 +5,8 @@
 			<row>
 				<label>Search 1</label>
 				<nb_visits>2</nb_visits>
-				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_hits>6</nb_hits>
 				<sum_time_spent>468</sum_time_spent>
-				<nb_hits_following_search>4</nb_hits_following_search>
-				<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>9</entry_nb_actions>
-				<entry_sum_visit_length>721</entry_sum_visit_length>
-				<entry_bounce_count>0</entry_bounce_count>
 				<nb_pages_per_search>3</nb_pages_per_search>
 				<avg_time_on_page>234</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
@@ -22,11 +15,8 @@
 			<row>
 				<label>Search 2</label>
 				<nb_visits>2</nb_visits>
-				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_hits>2</nb_hits>
 				<sum_time_spent>72</sum_time_spent>
-				<nb_hits_following_search>2</nb_hits_following_search>
-				<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
 				<exit_nb_visits>1</exit_nb_visits>
 				<nb_pages_per_search>1</nb_pages_per_search>
 				<avg_time_on_page>36</avg_time_on_page>
@@ -36,14 +26,8 @@
 			<row>
 				<label>No Result Keyword!</label>
 				<nb_visits>1</nb_visits>
-				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>36</sum_time_spent>
-				<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>2</entry_nb_actions>
-				<entry_sum_visit_length>145</entry_sum_visit_length>
-				<entry_bounce_count>0</entry_bounce_count>
 				<nb_pages_per_search>1</nb_pages_per_search>
 				<avg_time_on_page>36</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
@@ -54,11 +38,8 @@
 			<row>
 				<label>Final Keyword Searched for now.</label>
 				<nb_visits>1</nb_visits>
-				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<nb_hits_following_search>1</nb_hits_following_search>
-				<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
 				<exit_nb_visits>1</exit_nb_visits>
 				<nb_pages_per_search>1</nb_pages_per_search>
 				<avg_time_on_page>0</avg_time_on_page>
@@ -68,15 +49,8 @@
 			<row>
 				<label>Keyword - Tracking API</label>
 				<nb_visits>1</nb_visits>
-				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>2</nb_hits>
 				<sum_time_spent>72</sum_time_spent>
-				<nb_hits_following_search>1</nb_hits_following_search>
-				<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>3</entry_nb_actions>
-				<entry_sum_visit_length>325</entry_sum_visit_length>
-				<entry_bounce_count>0</entry_bounce_count>
 				<nb_pages_per_search>2</nb_pages_per_search>
 				<avg_time_on_page>72</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
@@ -85,10 +59,8 @@
 			<row>
 				<label>No Result Keyword!</label>
 				<nb_visits>1</nb_visits>
-				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>252</sum_time_spent>
-				<nb_hits_following_search>1</nb_hits_following_search>
 				<nb_pages_per_search>1</nb_pages_per_search>
 				<avg_time_on_page>252</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
@@ -106,7 +78,6 @@
 			<row>
 				<label>SHOULD be a Search with no result!</label>
 				<nb_visits>1</nb_visits>
-				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>180</sum_time_spent>
 				<nb_pages_per_search>1</nb_pages_per_search>
@@ -117,11 +88,8 @@
 			<row>
 				<label>You can use Piwik in: አማርኛ, العربية, Беларуская, Български, Català, Česky, Dansk, Deutsch, Ελληνικά, English, Español, Eesti keel, Euskara, فارسی, Suomi, Français, Galego, עברית, Magyar, Bahasa Indonesia, Íslenska, Italiano, 日本語, ქართული, 한국어, Lietuvių, Latviešu, Norsk (bokmål), Nederlands, Norsk (nynorsk), Polski, Português brasileiro, Português, Română, Русский, Slovensky%</label>
 				<nb_visits>1</nb_visits>
-				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>2</nb_hits>
 				<sum_time_spent>180</sum_time_spent>
-				<nb_hits_following_search>2</nb_hits_following_search>
-				<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
 				<exit_nb_visits>1</exit_nb_visits>
 				<nb_pages_per_search>2</nb_pages_per_search>
 				<avg_time_on_page>180</avg_time_on_page>
diff --git a/tests/integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml b/tests/integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml
index 16a411a94783d542ed8251963ac79c25bc5d495b..a9c76805e561c1cd0890cc5d602d30c4e0ee8358 100644
--- a/tests/integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml
+++ b/tests/integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml
@@ -7,13 +7,6 @@
 				<nb_visits>2</nb_visits>
 				<nb_hits>2</nb_hits>
 				<sum_time_spent>288</sum_time_spent>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>2</entry_nb_actions>
-				<entry_sum_visit_length>145</entry_sum_visit_length>
-				<entry_bounce_count>0</entry_bounce_count>
-				<nb_hits_following_search>1</nb_hits_following_search>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 				<nb_pages_per_search>1</nb_pages_per_search>
 				<avg_time_on_page>144</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
@@ -24,13 +17,6 @@
 				<nb_visits>2</nb_visits>
 				<nb_hits>6</nb_hits>
 				<sum_time_spent>468</sum_time_spent>
-				<nb_hits_following_search>4</nb_hits_following_search>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>9</entry_nb_actions>
-				<entry_sum_visit_length>721</entry_sum_visit_length>
-				<entry_bounce_count>0</entry_bounce_count>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 				<nb_pages_per_search>3</nb_pages_per_search>
 				<avg_time_on_page>234</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
@@ -41,10 +27,7 @@
 				<nb_visits>2</nb_visits>
 				<nb_hits>2</nb_hits>
 				<sum_time_spent>72</sum_time_spent>
-				<nb_hits_following_search>2</nb_hits_following_search>
 				<exit_nb_visits>1</exit_nb_visits>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<nb_pages_per_search>1</nb_pages_per_search>
 				<avg_time_on_page>36</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
@@ -55,10 +38,7 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<nb_hits_following_search>1</nb_hits_following_search>
 				<exit_nb_visits>1</exit_nb_visits>
-				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<nb_pages_per_search>1</nb_pages_per_search>
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
@@ -69,13 +49,6 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>2</nb_hits>
 				<sum_time_spent>72</sum_time_spent>
-				<nb_hits_following_search>1</nb_hits_following_search>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>3</entry_nb_actions>
-				<entry_sum_visit_length>325</entry_sum_visit_length>
-				<entry_bounce_count>0</entry_bounce_count>
-				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 				<nb_pages_per_search>2</nb_pages_per_search>
 				<avg_time_on_page>72</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
@@ -96,7 +69,6 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>180</sum_time_spent>
-				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<nb_pages_per_search>1</nb_pages_per_search>
 				<avg_time_on_page>180</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
@@ -107,10 +79,7 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>2</nb_hits>
 				<sum_time_spent>180</sum_time_spent>
-				<nb_hits_following_search>2</nb_hits_following_search>
 				<exit_nb_visits>1</exit_nb_visits>
-				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<nb_pages_per_search>2</nb_pages_per_search>
 				<avg_time_on_page>180</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
diff --git a/tests/integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchNoResultKeywords_day.xml b/tests/integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchNoResultKeywords_day.xml
index 8a1b416bea3c34a7a16902cf8def0193d88767dc..642212d4ce8fa97878b9fc03eaac8e7603fcc1d7 100644
--- a/tests/integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchNoResultKeywords_day.xml
+++ b/tests/integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchNoResultKeywords_day.xml
@@ -5,14 +5,8 @@
 			<row>
 				<label>No Result Keyword!</label>
 				<nb_visits>1</nb_visits>
-				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>36</sum_time_spent>
-				<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>2</entry_nb_actions>
-				<entry_sum_visit_length>145</entry_sum_visit_length>
-				<entry_bounce_count>0</entry_bounce_count>
 				<nb_pages_per_search>1</nb_pages_per_search>
 				<avg_time_on_page>36</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
@@ -23,10 +17,8 @@
 			<row>
 				<label>No Result Keyword!</label>
 				<nb_visits>1</nb_visits>
-				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>252</sum_time_spent>
-				<nb_hits_following_search>1</nb_hits_following_search>
 				<nb_pages_per_search>1</nb_pages_per_search>
 				<avg_time_on_page>252</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
@@ -44,7 +36,6 @@
 			<row>
 				<label>SHOULD be a Search with no result!</label>
 				<nb_visits>1</nb_visits>
-				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>180</sum_time_spent>
 				<nb_pages_per_search>1</nb_pages_per_search>
diff --git a/tests/integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchNoResultKeywords_month.xml b/tests/integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchNoResultKeywords_month.xml
index 9da97f74fcf355e547d09b7fcae2da844ceee7cb..e8b15cf40d47074c62a0538977693d8963e06254 100644
--- a/tests/integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchNoResultKeywords_month.xml
+++ b/tests/integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchNoResultKeywords_month.xml
@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
 	<result idSite="1">
-		<result date="2010-01" />
+		<result date="2010-01">
+			<row>
+				<label>No Result Keyword!</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>288</sum_time_spent>
+				<nb_pages_per_search>1</nb_pages_per_search>
+				<avg_time_on_page>144</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>0%</exit_rate>
+			</row>
+		</result>
 		<result date="2010-02" />
 		<result date="2010-03" />
 		<result date="2010-04" />
@@ -16,7 +27,6 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>180</sum_time_spent>
-				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<nb_pages_per_search>1</nb_pages_per_search>
 				<avg_time_on_page>180</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
diff --git a/tests/integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_day.xml b/tests/integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_day.xml
index d3d1def26a2ae1e4090f5b3e29269c03161dabbd..588feafeea9df820d64cef1d9d3dc09af3f503db 100644
--- a/tests/integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_day.xml
+++ b/tests/integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_day.xml
@@ -3,15 +3,8 @@
 	<row>
 		<label>Search 1</label>
 		<nb_visits>2</nb_visits>
-		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_hits>6</nb_hits>
 		<sum_time_spent>468</sum_time_spent>
-		<nb_hits_following_search>4</nb_hits_following_search>
-		<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>9</entry_nb_actions>
-		<entry_sum_visit_length>721</entry_sum_visit_length>
-		<entry_bounce_count>0</entry_bounce_count>
 		<nb_pages_per_search>3</nb_pages_per_search>
 		<avg_time_on_page>234</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
@@ -20,11 +13,8 @@
 	<row>
 		<label>Search 2</label>
 		<nb_visits>2</nb_visits>
-		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_hits>2</nb_hits>
 		<sum_time_spent>72</sum_time_spent>
-		<nb_hits_following_search>2</nb_hits_following_search>
-		<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
 		<exit_nb_visits>1</exit_nb_visits>
 		<nb_pages_per_search>1</nb_pages_per_search>
 		<avg_time_on_page>36</avg_time_on_page>
@@ -34,14 +24,8 @@
 	<row>
 		<label>No Result Keyword!</label>
 		<nb_visits>1</nb_visits>
-		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>36</sum_time_spent>
-		<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
-		<entry_sum_visit_length>145</entry_sum_visit_length>
-		<entry_bounce_count>0</entry_bounce_count>
 		<nb_pages_per_search>1</nb_pages_per_search>
 		<avg_time_on_page>36</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
diff --git a/tests/integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml b/tests/integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml
index 62c644d3e26d4e6c6fd908cd88ac525ca9fe8994..e1e9b882321b65e0559f224bf511afede1ceb226 100644
--- a/tests/integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml
+++ b/tests/integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml
@@ -5,13 +5,6 @@
 		<nb_visits>2</nb_visits>
 		<nb_hits>2</nb_hits>
 		<sum_time_spent>288</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
-		<entry_sum_visit_length>145</entry_sum_visit_length>
-		<entry_bounce_count>0</entry_bounce_count>
-		<nb_hits_following_search>1</nb_hits_following_search>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 		<nb_pages_per_search>1</nb_pages_per_search>
 		<avg_time_on_page>144</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
@@ -22,13 +15,6 @@
 		<nb_visits>2</nb_visits>
 		<nb_hits>6</nb_hits>
 		<sum_time_spent>468</sum_time_spent>
-		<nb_hits_following_search>4</nb_hits_following_search>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>9</entry_nb_actions>
-		<entry_sum_visit_length>721</entry_sum_visit_length>
-		<entry_bounce_count>0</entry_bounce_count>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 		<nb_pages_per_search>3</nb_pages_per_search>
 		<avg_time_on_page>234</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
@@ -39,10 +25,7 @@
 		<nb_visits>2</nb_visits>
 		<nb_hits>2</nb_hits>
 		<sum_time_spent>72</sum_time_spent>
-		<nb_hits_following_search>2</nb_hits_following_search>
 		<exit_nb_visits>1</exit_nb_visits>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<nb_pages_per_search>1</nb_pages_per_search>
 		<avg_time_on_page>36</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
@@ -53,10 +36,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<nb_hits_following_search>1</nb_hits_following_search>
 		<exit_nb_visits>1</exit_nb_visits>
-		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<nb_pages_per_search>1</nb_pages_per_search>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
@@ -67,13 +47,6 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>2</nb_hits>
 		<sum_time_spent>72</sum_time_spent>
-		<nb_hits_following_search>1</nb_hits_following_search>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>3</entry_nb_actions>
-		<entry_sum_visit_length>325</entry_sum_visit_length>
-		<entry_bounce_count>0</entry_bounce_count>
-		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 		<nb_pages_per_search>2</nb_pages_per_search>
 		<avg_time_on_page>72</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
diff --git a/tests/integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchNoResultKeywords_day.xml b/tests/integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchNoResultKeywords_day.xml
index d1b2916257e63ea4c9a94218877fadcdfd456b41..7eb0674f509f0459bc3f57788442541d785c0bc0 100644
--- a/tests/integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchNoResultKeywords_day.xml
+++ b/tests/integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchNoResultKeywords_day.xml
@@ -3,14 +3,8 @@
 	<row>
 		<label>No Result Keyword!</label>
 		<nb_visits>1</nb_visits>
-		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>36</sum_time_spent>
-		<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
-		<entry_sum_visit_length>145</entry_sum_visit_length>
-		<entry_bounce_count>0</entry_bounce_count>
 		<nb_pages_per_search>1</nb_pages_per_search>
 		<avg_time_on_page>36</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
diff --git a/tests/integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchNoResultKeywords_month.xml b/tests/integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchNoResultKeywords_month.xml
index c234bed59e963e268d7a9bc05348d941758c4aa9..f1569434b492631bda2ca6988cdcba2cff614ccc 100644
--- a/tests/integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchNoResultKeywords_month.xml
+++ b/tests/integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchNoResultKeywords_month.xml
@@ -1,2 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result />
\ No newline at end of file
+<result>
+	<row>
+		<label>No Result Keyword!</label>
+		<nb_visits>2</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>288</sum_time_spent>
+		<nb_pages_per_search>1</nb_pages_per_search>
+		<avg_time_on_page>144</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>0%</exit_rate>
+	</row>
+</result>
\ No newline at end of file