diff --git a/plugins/Actions/ArchivingHelper.php b/plugins/Actions/ArchivingHelper.php
index fdf3f541eb2218d451ae1aab201c54108c02be1f..6b05338e61d084391498f71928f1ad1cd06a4943 100644
--- a/plugins/Actions/ArchivingHelper.php
+++ b/plugins/Actions/ArchivingHelper.php
@@ -356,6 +356,10 @@ class ArchivingHelper
         /* @var DataTable $currentTable */
         $currentTable =& $actionsTablesByType[$actionType];
 
+        if(is_null($currentTable)) {
+            throw new \Exception("Action table for type '$actionType' was not found during Actions archiving.");
+        }
+
         // check for ranking query cut-off
         if ($actionName == DataTable::LABEL_SUMMARY_ROW) {
             $summaryRow = $currentTable->getRowFromId(DataTable::ID_SUMMARY_ROW);
diff --git a/tests/PHPUnit/Fixtures/OneVisitSeveralPageViews.php b/tests/PHPUnit/Fixtures/OneVisitSeveralPageViews.php
index 53c8dfb5385627246fcf1d1418bc3dbd3217a27e..2f2341dd821777c278be9d31566427bb8225056f 100644
--- a/tests/PHPUnit/Fixtures/OneVisitSeveralPageViews.php
+++ b/tests/PHPUnit/Fixtures/OneVisitSeveralPageViews.php
@@ -52,6 +52,11 @@ class Test_Piwik_Fixture_OneVisitSeveralPageViews extends Test_Piwik_BaseFixture
         $t->setGenerationTime(153);
         self::checkResponse($t->doTrackPageView('incredible parent title! <>,; / subtitle <>,;'));
 
+        $t->setUrl('http://example.org/dir/file.php?foo=bar&foo2=bar2');
+        $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.31)->getDatetime());
+        $t->setGenerationTime(153);
+        self::checkResponse($t->doTrackEvent('Category', 'Action', 'Name', 11111));
+
         $t->setUrl('http://example.org/dir2/file.php?foo=bar&foo2=bar');
         $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.4)->getDatetime());
         $t->setGenerationTime(1233);
diff --git a/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php b/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php
index cc8a20e8be73bb866bccd1d02571cea59b14cc01..ba7032f177701e47e90844d5a97ff612febd51ee 100644
--- a/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php
+++ b/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php
@@ -48,8 +48,11 @@ class Test_Piwik_Fixture_SomeVisitsManyPageviewsWithTransitions extends Test_Piw
         $this->trackPageView($tracker, 0.3, 'the/third_page.html?foo=bar');
         $this->trackPageView($tracker, 0.4, 'page/one.html');
         $this->trackPageView($tracker, 0.5, 'the/third_page.html?foo=bar');
+        $this->trackPageView($tracker, 0.5, 'the/third_page.html?foo=bar');
+        $this->trackPageView($tracker, 0.6, 'page/one.html');
         $this->trackPageView($tracker, 0.6, 'page/one.html');
         $this->trackPageView($tracker, 0.7, 'the/third_page.html?foo=baz#anchor1');
+        $this->trackPageView($tracker, 0.7, 'the/third_page.html?foo=baz#anchor1');
         $this->trackPageView($tracker, 0.8, 'page/one.html');
         $this->trackPageView($tracker, 0.9, 'page/one.html');
         $this->trackPageView($tracker, 1.0, 'the/third_page.html?foo=baz#anchor2');
@@ -85,15 +88,13 @@ class Test_Piwik_Fixture_SomeVisitsManyPageviewsWithTransitions extends Test_Piw
         // before & after
         $tracker->setIp('156.5.3.6');
         $tracker->setNewVisitorId();
-        $this->trackPageView($tracker, 0, 'page/search.html#q=mykwd', $this->dateTime, $pageViewType = 'site-search',
-                             $searchKeyword = 'mykwd', $searchCategory = 'mysearchcat');
+        $this->trackPageView($tracker, 0, 'page/search.html#q=mykwd', $this->dateTime, $pageViewType = 'site-search', $searchKeyword = 'mykwd', $searchCategory = 'mysearchcat');
         $this->trackPageView($tracker, 0.1, 'page/one.html');
-        $this->trackPageView($tracker, 0.2, 'page/search.html#q=anotherkwd', $this->dateTime,
-                             $pageViewType = 'site-search', $searchKeyword = 'anotherkwd',
-                             $searchCategory = 'mysearchcat');
+        $this->trackPageView($tracker, 0.2, 'page/search.html#q=anotherkwd', $this->dateTime, $pageViewType = 'site-search', $searchKeyword = 'anotherkwd', $searchCategory = 'mysearchcat');
         $this->trackPageView($tracker, 0.25, 'page/one.html');
         $this->trackPageView($tracker, 0.3, 'to/outlink/page.html', $this->dateTime, $pageViewType = 'outlink');
         $this->trackPageView($tracker, 0.35, 'page/one.html');
+        $this->trackPageView($tracker, 0.11, 'page/search.html#q=thirdkwd', $this->dateTime, $pageViewType = 'event', 'Song name here', 'Music');
         $this->trackPageView($tracker, 0.4, '', $this->dateTime, $pageViewType = 'download');
         $this->trackPageView($tracker, 0.45, 'page/one.html');
         $this->trackPageView($tracker, 0.5, '', $this->dateTime, $pageViewType = 'download');
@@ -104,9 +105,9 @@ class Test_Piwik_Fixture_SomeVisitsManyPageviewsWithTransitions extends Test_Piw
         $laterDate = Date::factory($this->dateTime)->addDay(8)->getDatetime();
         $tracker->setIp('156.5.3.7');
         $tracker->setNewVisitorId();
-        $this->trackPageView($tracker, 0, 'page/search.html#q=thirdkwd', $laterDate, $pageViewType = 'site-search',
-                             $searchKeyword = 'thirdkwd', $searchCategory = 'mysearchcat');
+        $this->trackPageView($tracker, 0, 'page/search.html#q=thirdkwd', $laterDate, $pageViewType = 'site-search', $searchKeyword = 'thirdkwd', $searchCategory = 'mysearchcat');
         $this->trackPageView($tracker, 0.1, 'page/one.html', $laterDate);
+        $this->trackPageView($tracker, 0.11, 'page/search.html#q=thirdkwd', $laterDate, $pageViewType = 'event', 'Song name here', 'Music');
         $this->trackPageView($tracker, 0.15, 'to/another/outlink.html', $laterDate, $pageViewType = 'outlink');
         $this->trackPageView($tracker, 0.2, 'page/one.html', $laterDate);
         $this->trackPageView($tracker, 0.25, '', $laterDate, $pageViewType = 'download');
@@ -143,6 +144,8 @@ class Test_Piwik_Fixture_SomeVisitsManyPageviewsWithTransitions extends Test_Piw
             self::assertTrue($visit->doTrackAction($downloadUrl, 'download'));
         } else if ($pageViewType == 'site-search') {
             self::assertTrue($visit->doTrackSiteSearch($searchKeyword, $searchCategory, $this->prefixCounter));
+        } else if ($pageViewType == 'event') {
+            self::assertTrue($visit->doTrackEvent($searchCategory, "event name", $searchKeyword, $this->prefixCounter));
         }
     }
 }
diff --git a/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.php b/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.php
index 0280e3661f370e09e50436fef926b46eb229f4da..353ad4ec31292d6969b8cb51eecbaf0e7fcf347e 100644
--- a/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.php
+++ b/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.php
@@ -70,6 +70,9 @@ class Test_Piwik_Fixture_ThreeSitesWithManyVisitsWithSiteSearch extends Test_Piw
         $visitor->setUrl('http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE');
         self::checkResponse($visitor->doTrackPageView('This is a pageview, not a Search - IS_FOLLOWING_SEARCH ONCE'));
 
+        $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.24)->getDatetime());
+        self::checkResponse($visitor->doTrackEvent("Event CAT", "Event ACTION", "Event NAME", $count = 3.33));
+
         $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.25)->getDatetime());
         $visitor->setUrl('http://example.org/index.htm?standard=query&but=also#hash&q=' . urlencode('Search 1'));
         self::checkResponse($visitor->doTrackPageView('Site Search results - URL Fragment'));
@@ -113,6 +116,9 @@ class Test_Piwik_Fixture_ThreeSitesWithManyVisitsWithSiteSearch extends Test_Piw
         $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(24.42)->getDatetime());
         self::checkResponse($visitor->doTrackSiteSearch("Keyword - Tracking API", "Category", $count = 5));
 
+        $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(24.425)->getDatetime());
+        self::checkResponse($visitor->doTrackEvent("Event CAT", "Event ACTION", "Event NAME", $count));
+
         $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(24.43)->getDatetime());
         self::checkResponse($visitor->doTrackSiteSearch("No Result Keyword!", "Bad No Result Category :(", $count = 0));
 
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_dir__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_LabelFilter_dir__Actions.getPageUrls_day.xml
index 0e48fa061194ca2b001fb86b9009c20296b45276..f5d57d7a79d31e2b8e97837f52c8576073bd11c1 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_dir__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_LabelFilter_dir__Actions.getPageUrls_day.xml
@@ -4,11 +4,11 @@
 		<label>dir</label>
 		<nb_visits>2</nb_visits>
 		<nb_hits>2</nb_hits>
-		<sum_time_spent>720</sum_time_spent>
+		<sum_time_spent>684</sum_time_spent>
 		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 		<min_time_generation>0.123</min_time_generation>
 		<max_time_generation>0.153</max_time_generation>
-		<avg_time_on_page>360</avg_time_on_page>
+		<avg_time_on_page>342</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.138</avg_time_generation>
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_dir_range__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_LabelFilter_dir_range__Actions.getPageUrls_day.xml
index 12f05836b0631ba57da80ebb1a97ef5473fa7f8b..9ece84f6b1eb2c8d17d8e459fd2c8eb2ffc13fc2 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_dir_range__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_LabelFilter_dir_range__Actions.getPageUrls_day.xml
@@ -5,11 +5,11 @@
 			<label>dir</label>
 			<nb_visits>2</nb_visits>
 			<nb_hits>2</nb_hits>
-			<sum_time_spent>720</sum_time_spent>
+			<sum_time_spent>684</sum_time_spent>
 			<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 			<min_time_generation>0.123</min_time_generation>
 			<max_time_generation>0.153</max_time_generation>
-			<avg_time_on_page>360</avg_time_on_page>
+			<avg_time_on_page>342</avg_time_on_page>
 			<bounce_rate>0%</bounce_rate>
 			<exit_rate>0%</exit_rate>
 			<avg_time_generation>0.138</avg_time_generation>
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/Integration/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml
index a9787b043a8ff7181c65a2e79bd2a98e70946ca2..ea194078ed53fa74fb3f687b3cfaf081052d7ef9 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml
@@ -4,8 +4,8 @@
 		<label>&lt;&gt;&amp;\&quot;the pdo extension is required for this adapter but the extension is not loaded</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>6</max_actions>
+		<nb_actions>7</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1441</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml
index 143b7b60358ba8071b4e0cf2fd9a76dfff93fccb..bbbd02dd81d7f6cae96ac5e4b3b20fa2a8e0efb7 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml
@@ -11,7 +11,7 @@
 		<max_time_generation>0.523</max_time_generation>
 		<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
 		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>6</entry_nb_actions>
+		<entry_nb_actions>7</entry_nb_actions>
 		<entry_sum_visit_length>1441</entry_sum_visit_length>
 		<entry_bounce_count>0</entry_bounce_count>
 		<avg_time_on_page>720</avg_time_on_page>
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_titlesRecursive__Actions.getPageTitles_day.xml b/tests/PHPUnit/Integration/expected/test_LabelFilter_titlesRecursive__Actions.getPageTitles_day.xml
index bf311ea708f6536d9373e2901a0221da74f251a7..718edc60acf16e2cc442e144894506b485d0e43d 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_titlesRecursive__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_LabelFilter_titlesRecursive__Actions.getPageTitles_day.xml
@@ -5,11 +5,11 @@
 		<nb_visits>1</nb_visits>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_hits>1</nb_hits>
-		<sum_time_spent>360</sum_time_spent>
+		<sum_time_spent>324</sum_time_spent>
 		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 		<min_time_generation>0.153</min_time_generation>
 		<max_time_generation>0.153</max_time_generation>
-		<avg_time_on_page>360</avg_time_on_page>
+		<avg_time_on_page>324</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.153</avg_time_generation>
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml b/tests/PHPUnit/Integration/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml
index c0b8a2e8e194e47f794fea01c838bfb4d92aa1cb..667e9fcd902e28c6b02b15632814089043a34a7e 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml
@@ -11,7 +11,7 @@
 		<max_time_generation>1.233</max_time_generation>
 		<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
 		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>6</entry_nb_actions>
+		<entry_nb_actions>7</entry_nb_actions>
 		<entry_sum_visit_length>1441</entry_sum_visit_length>
 		<entry_bounce_count>0</entry_bounce_count>
 		<avg_time_on_page>1080</avg_time_on_page>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
index 5615f1f837d13b3e36c82eb83614be57689db160..c4b69d415749db627b02676cd7d06f7e753b3867 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
@@ -63,7 +63,7 @@
 				<label> This is a pageview, not a Search - IS_FOLLOWING_SEARCH ONCE</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>2</nb_hits>
-				<avg_time_on_page>00:04:12</avg_time_on_page>
+				<avg_time_on_page>00:03:36</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 				<avg_time_generation>0s</avg_time_generation>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml
index e085a650843beb876f164f02ad86d26a64389ef5..8437bbfd21f4d0ef63a2f4da88fab3d3066389bd 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml
@@ -63,7 +63,7 @@
 				<label> This is a pageview, not a Search - IS_FOLLOWING_SEARCH ONCE</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>2</nb_hits>
-				<avg_time_on_page>00:04:12</avg_time_on_page>
+				<avg_time_on_page>00:03:36</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 				<avg_time_generation>0s</avg_time_generation>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
index 4d60e7116f3bb0a3abb40da43f724c60caa4c5f6..be049f4a0828517a3edda14eefeb2d4ba553f913 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
@@ -63,7 +63,7 @@
 				<label>/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>2</nb_hits>
-				<avg_time_on_page>00:04:12</avg_time_on_page>
+				<avg_time_on_page>00:03:36</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 				<avg_time_generation>0s</avg_time_generation>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml
index 80e35d17fe9841f82caa87db2f3aeab4f6df0146..5d5eef484acff192b002a443b8f120f120d8531d 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml
@@ -63,7 +63,7 @@
 				<label>/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>2</nb_hits>
-				<avg_time_on_page>00:04:12</avg_time_on_page>
+				<avg_time_on_page>00:03:36</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 				<avg_time_generation>0s</avg_time_generation>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml
index 42a3ffc50f3b6da927f2dd9ccd4c84c0f0c6b567..7ea5167dfd336321ad12a7418407a3a98cee1070 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml
@@ -18,9 +18,9 @@
 				<nb_visits>1</nb_visits>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>2</nb_hits>
-				<sum_time_spent>252</sum_time_spent>
+				<sum_time_spent>216</sum_time_spent>
 				<nb_hits_following_search>1</nb_hits_following_search>
-				<avg_time_on_page>252</avg_time_on_page>
+				<avg_time_on_page>216</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 			</row>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml
index df9d619c4803f2fd89c8507f226170d5c92e59fb..86ae401b608af7e8f4273b331039bdd9d1322496 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml
@@ -17,10 +17,10 @@
 				<label> This is a pageview, not a Search - IS_FOLLOWING_SEARCH ONCE</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>2</nb_hits>
-				<sum_time_spent>252</sum_time_spent>
+				<sum_time_spent>216</sum_time_spent>
 				<nb_hits_following_search>1</nb_hits_following_search>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<avg_time_on_page>252</avg_time_on_page>
+				<avg_time_on_page>216</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 			</row>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml
index 1844fe3ea9d07400e28923e13ffb569132481e8c..9dc49472a772529aca11429710c8a7a84079396b 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml
@@ -30,9 +30,9 @@
 				<nb_visits>1</nb_visits>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>2</nb_hits>
-				<sum_time_spent>252</sum_time_spent>
+				<sum_time_spent>216</sum_time_spent>
 				<nb_hits_following_search>1</nb_hits_following_search>
-				<avg_time_on_page>252</avg_time_on_page>
+				<avg_time_on_page>216</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 			</row>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml
index 916f77350dca046fba8f357959b39dd61b810625..d9462f0f36479c39c41ead37ca2a8bc88326be43 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml
@@ -29,10 +29,10 @@
 				<label> This is a pageview, not a Search - IS_FOLLOWING_SEARCH ONCE</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>2</nb_hits>
-				<sum_time_spent>252</sum_time_spent>
+				<sum_time_spent>216</sum_time_spent>
 				<nb_hits_following_search>1</nb_hits_following_search>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<avg_time_on_page>252</avg_time_on_page>
+				<avg_time_on_page>216</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 			</row>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml
index f2cd38abff78f146d4c17870f513de04d51f87f6..74ece58337ed89f8d879d432f2d2c2896e835468 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml
@@ -19,9 +19,9 @@
 				<nb_visits>1</nb_visits>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>2</nb_hits>
-				<sum_time_spent>252</sum_time_spent>
+				<sum_time_spent>216</sum_time_spent>
 				<nb_hits_following_search>1</nb_hits_following_search>
-				<avg_time_on_page>252</avg_time_on_page>
+				<avg_time_on_page>216</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 				<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml
index f3520679b31e8d0ba78b1a15be9bb24d2f66e8e3..1c66040802fc6f6c1c76575063e5ce8e3b7400f0 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml
@@ -18,10 +18,10 @@
 				<label>/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>2</nb_hits>
-				<sum_time_spent>252</sum_time_spent>
+				<sum_time_spent>216</sum_time_spent>
 				<nb_hits_following_search>1</nb_hits_following_search>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<avg_time_on_page>252</avg_time_on_page>
+				<avg_time_on_page>216</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 				<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml
index 59ae27f868c5a87d6d3e5cbcaa6a78ce1365b8ca..ff058d70ebe2ee0b95a948509e9aaa11083b5d08 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml
@@ -32,9 +32,9 @@
 				<nb_visits>1</nb_visits>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>2</nb_hits>
-				<sum_time_spent>252</sum_time_spent>
+				<sum_time_spent>216</sum_time_spent>
 				<nb_hits_following_search>1</nb_hits_following_search>
-				<avg_time_on_page>252</avg_time_on_page>
+				<avg_time_on_page>216</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 				<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml
index 06cee5908091e4b9aff6c4282da4d4f3e1c3a223..87e23ee986e085e04ccf43256149158067464b18 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml
@@ -31,10 +31,10 @@
 				<label>/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>2</nb_hits>
-				<sum_time_spent>252</sum_time_spent>
+				<sum_time_spent>216</sum_time_spent>
 				<nb_hits_following_search>1</nb_hits_following_search>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<avg_time_on_page>252</avg_time_on_page>
+				<avg_time_on_page>216</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 				<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml
index df088f8ae0a34f9276bccf2e8b8fd2f8e4ebc903..4798b08e6e9a62ecdc4adde6ef9174ac7eb468e1 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml
@@ -50,9 +50,9 @@
 				<label>Keyword - Tracking API</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>2</nb_hits>
-				<sum_time_spent>72</sum_time_spent>
+				<sum_time_spent>54</sum_time_spent>
 				<nb_pages_per_search>2</nb_pages_per_search>
-				<avg_time_on_page>72</avg_time_on_page>
+				<avg_time_on_page>54</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 			</row>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml
index 777e92604627c1801c91e8794676bae4ce8923ac..5b6e7c4828f14d3f4d17e7e4a210d943794bc03f 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml
@@ -48,9 +48,9 @@
 				<label>Keyword - Tracking API</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>2</nb_hits>
-				<sum_time_spent>72</sum_time_spent>
+				<sum_time_spent>54</sum_time_spent>
 				<nb_pages_per_search>2</nb_pages_per_search>
-				<avg_time_on_page>72</avg_time_on_page>
+				<avg_time_on_page>54</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 			</row>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml
index e10559a3ff775a292d8ca0b783fc3dbd480ea70c..66f8e8a41db4c36a912c53cec42590d8b3206d0a 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml
@@ -16,9 +16,9 @@
 		<nb_visits>1</nb_visits>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_hits>2</nb_hits>
-		<sum_time_spent>252</sum_time_spent>
+		<sum_time_spent>216</sum_time_spent>
 		<nb_hits_following_search>1</nb_hits_following_search>
-		<avg_time_on_page>252</avg_time_on_page>
+		<avg_time_on_page>216</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
 	</row>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml
index 6acd58438c4bff8cbd3a6f3170b8fc471d9e968a..450ab9b87a21e5bd586e842e68267c7cd39a89f1 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml
@@ -15,10 +15,10 @@
 		<label> This is a pageview, not a Search - IS_FOLLOWING_SEARCH ONCE</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>2</nb_hits>
-		<sum_time_spent>252</sum_time_spent>
+		<sum_time_spent>216</sum_time_spent>
 		<nb_hits_following_search>1</nb_hits_following_search>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<avg_time_on_page>252</avg_time_on_page>
+		<avg_time_on_page>216</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
 	</row>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml
index ea5dc0727ffecf7510e29d724379f61f4ba1a0ef..200b1c35651a2b4e5bcf851369347c7dd0b0f432 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml
@@ -28,9 +28,9 @@
 		<nb_visits>1</nb_visits>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_hits>2</nb_hits>
-		<sum_time_spent>252</sum_time_spent>
+		<sum_time_spent>216</sum_time_spent>
 		<nb_hits_following_search>1</nb_hits_following_search>
-		<avg_time_on_page>252</avg_time_on_page>
+		<avg_time_on_page>216</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
 	</row>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml
index e93e5be074f4a8f426d92fd1a8e5f35492f44739..3adcd2fca870261603fdaf572c1ec1b378a3b7af 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml
@@ -27,10 +27,10 @@
 		<label> This is a pageview, not a Search - IS_FOLLOWING_SEARCH ONCE</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>2</nb_hits>
-		<sum_time_spent>252</sum_time_spent>
+		<sum_time_spent>216</sum_time_spent>
 		<nb_hits_following_search>1</nb_hits_following_search>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<avg_time_on_page>252</avg_time_on_page>
+		<avg_time_on_page>216</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
 	</row>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml
index fd921c75d2965a54d8b0706b269ba24c9daa4543..3fbf138c64b5d42c21c5dc2af4768bd689113ee2 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml
@@ -17,9 +17,9 @@
 		<nb_visits>1</nb_visits>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_hits>2</nb_hits>
-		<sum_time_spent>252</sum_time_spent>
+		<sum_time_spent>216</sum_time_spent>
 		<nb_hits_following_search>1</nb_hits_following_search>
-		<avg_time_on_page>252</avg_time_on_page>
+		<avg_time_on_page>216</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
 		<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml
index 39ff15c590e20d200cc44079b5a472f1704c8864..77a97cfa0b5827d7997506e9a7faa0f4f67954c0 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml
@@ -16,10 +16,10 @@
 		<label>/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>2</nb_hits>
-		<sum_time_spent>252</sum_time_spent>
+		<sum_time_spent>216</sum_time_spent>
 		<nb_hits_following_search>1</nb_hits_following_search>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<avg_time_on_page>252</avg_time_on_page>
+		<avg_time_on_page>216</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
 		<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml
index fe8ca37c19d6b6df2c6a44d1efceb0e056ee6a36..f709bef598cff52c736f4ea5b5ffb6f3f08a5622 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml
@@ -30,9 +30,9 @@
 		<nb_visits>1</nb_visits>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_hits>2</nb_hits>
-		<sum_time_spent>252</sum_time_spent>
+		<sum_time_spent>216</sum_time_spent>
 		<nb_hits_following_search>1</nb_hits_following_search>
-		<avg_time_on_page>252</avg_time_on_page>
+		<avg_time_on_page>216</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
 		<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml
index f7e45561dec69884b8fde67e3f194f2512e6ca41..a7eeb309c9624c466fc6278cdb0a83610befd0a6 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml
@@ -29,10 +29,10 @@
 		<label>/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>2</nb_hits>
-		<sum_time_spent>252</sum_time_spent>
+		<sum_time_spent>216</sum_time_spent>
 		<nb_hits_following_search>1</nb_hits_following_search>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<avg_time_on_page>252</avg_time_on_page>
+		<avg_time_on_page>216</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
 		<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml
index 7de408b2e215cdaeb8ee012673e2d5fa1bdd406f..3e1015bd31a00b8b590eb85947281aee7053acd4 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml
@@ -46,9 +46,9 @@
 		<label>Keyword - Tracking API</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>2</nb_hits>
-		<sum_time_spent>72</sum_time_spent>
+		<sum_time_spent>54</sum_time_spent>
 		<nb_pages_per_search>2</nb_pages_per_search>
-		<avg_time_on_page>72</avg_time_on_page>
+		<avg_time_on_page>54</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
 	</row>
diff --git a/tests/PHPUnit/Integration/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml b/tests/PHPUnit/Integration/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml
index 08f9e6371c643bbc717be8023e348833f0913415..71f56cb486da675616f9507c8d8fef16fe17c90f 100644
--- a/tests/PHPUnit/Integration/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml
@@ -22,10 +22,10 @@
 		</row>
 	</previousSiteSearches>
 	<pageMetrics>
-		<loops>1</loops>
-		<pageviews>17</pageviews>
+		<loops>2</loops>
+		<pageviews>18</pageviews>
 		<entries>4</entries>
-		<exits>3</exits>
+		<exits>2</exits>
 	</pageMetrics>
 	<followingPages>
 		<row>
@@ -38,7 +38,7 @@
 		</row>
 		<row>
 			<label>Others</label>
-			<referrals>3</referrals>
+			<referrals>4</referrals>
 		</row>
 	</followingPages>
 	<followingSiteSearches>
@@ -49,7 +49,7 @@
 	</followingSiteSearches>
 	<outlinks>
 		<row>
-			<label>https://anothersite.com/to/outlink/page.html</label>
+			<label>http://www.anothersite.com/to/outlink/page.html</label>
 			<referrals>1</referrals>
 		</row>
 		<row>
@@ -59,11 +59,11 @@
 	</outlinks>
 	<downloads>
 		<row>
-			<label>http://example.org/downloads/29.tar.gz</label>
+			<label>http://example.org/downloads/33.tar.gz</label>
 			<referrals>1</referrals>
 		</row>
 		<row>
-			<label>https://example.org/downloads/31.tar.gz</label>
+			<label>https://example.org/downloads/35.tar.gz</label>
 			<referrals>1</referrals>
 		</row>
 	</downloads>
diff --git a/tests/PHPUnit/Integration/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml b/tests/PHPUnit/Integration/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml
index f7efa407b4209a0ebd935684d104431e36e24070..22113d06bb54b5b310c5b402c083f32d89e1eb3e 100644
--- a/tests/PHPUnit/Integration/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml
@@ -22,10 +22,10 @@
 		</row>
 	</previousSiteSearches>
 	<pageMetrics>
-		<loops>1</loops>
-		<pageviews>20</pageviews>
+		<loops>2</loops>
+		<pageviews>21</pageviews>
 		<entries>4</entries>
-		<exits>3</exits>
+		<exits>1</exits>
 	</pageMetrics>
 	<followingPages>
 		<row>
@@ -38,7 +38,7 @@
 		</row>
 		<row>
 			<label>Others</label>
-			<referrals>3</referrals>
+			<referrals>5</referrals>
 		</row>
 	</followingPages>
 	<followingSiteSearches>
@@ -49,7 +49,7 @@
 	</followingSiteSearches>
 	<outlinks>
 		<row>
-			<label>https://anothersite.com/to/outlink/page.html</label>
+			<label>http://www.anothersite.com/to/outlink/page.html</label>
 			<referrals>1</referrals>
 		</row>
 		<row>
@@ -63,11 +63,11 @@
 	</outlinks>
 	<downloads>
 		<row>
-			<label>http://example.org/downloads/29.tar.gz</label>
+			<label>http://example.org/downloads/33.tar.gz</label>
 			<referrals>1</referrals>
 		</row>
 		<row>
-			<label>https://example.org/downloads/31.tar.gz</label>
+			<label>https://example.org/downloads/35.tar.gz</label>
 			<referrals>1</referrals>
 		</row>
 		<row>
diff --git a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml b/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml
index c525d6e196096fcdcf5a77e4f31e2e41eef28cb7..380f8c0fe5df4dcdc3a6cdb3e9c697b53337b598 100644
--- a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml
@@ -30,8 +30,8 @@
 		</row>
 	</previousSiteSearches>
 	<pageMetrics>
-		<loops>4</loops>
-		<pageviews>16</pageviews>
+		<loops>5</loops>
+		<pageviews>17</pageviews>
 		<entries>3</entries>
 		<exits>-1</exits>
 	</pageMetrics>
@@ -65,7 +65,7 @@
 	</followingSiteSearches>
 	<outlinks>
 		<row>
-			<label>https://anothersite.com/to/outlink/page.html</label>
+			<label>http://www.anothersite.com/to/outlink/page.html</label>
 			<referrals>1</referrals>
 		</row>
 		<row>
@@ -75,11 +75,11 @@
 	</outlinks>
 	<downloads>
 		<row>
-			<label>http://example.org/downloads/29.tar.gz</label>
+			<label>http://example.org/downloads/33.tar.gz</label>
 			<referrals>1</referrals>
 		</row>
 		<row>
-			<label>https://example.org/downloads/31.tar.gz</label>
+			<label>https://example.org/downloads/35.tar.gz</label>
 			<referrals>1</referrals>
 		</row>
 	</downloads>
diff --git a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_month.xml b/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_month.xml
index fd16ae1d5b1a055776f2edf23eb7d9ebcc0a99fd..2e262a752edb3f454afd9a11a69b953a62f63304 100644
--- a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_month.xml
@@ -34,8 +34,8 @@
 		</row>
 	</previousSiteSearches>
 	<pageMetrics>
-		<loops>6</loops>
-		<pageviews>19</pageviews>
+		<loops>7</loops>
+		<pageviews>20</pageviews>
 		<entries>3</entries>
 		<exits>-3</exits>
 	</pageMetrics>
@@ -69,7 +69,7 @@
 	</followingSiteSearches>
 	<outlinks>
 		<row>
-			<label>https://anothersite.com/to/outlink/page.html</label>
+			<label>http://www.anothersite.com/to/outlink/page.html</label>
 			<referrals>1</referrals>
 		</row>
 		<row>
@@ -77,21 +77,21 @@
 			<referrals>1</referrals>
 		</row>
 		<row>
-			<label>https://anothersite.com/to/another/outlink.html</label>
+			<label>http://anothersite.com/to/another/outlink.html</label>
 			<referrals>1</referrals>
 		</row>
 	</outlinks>
 	<downloads>
 		<row>
-			<label>http://example.org/downloads/29.tar.gz</label>
+			<label>http://example.org/downloads/33.tar.gz</label>
 			<referrals>1</referrals>
 		</row>
 		<row>
-			<label>https://example.org/downloads/31.tar.gz</label>
+			<label>https://example.org/downloads/35.tar.gz</label>
 			<referrals>1</referrals>
 		</row>
 		<row>
-			<label>http://www.example.org/downloads/38.tar.gz</label>
+			<label>https://example.org/downloads/43.tar.gz</label>
 			<referrals>1</referrals>
 		</row>
 	</downloads>
diff --git a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml b/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml
index d950a5b23fbe55f7c46458df95e8783c9393d5d2..b246688e1c895c7314c40e6eeb8223633e3298fc 100644
--- a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml
@@ -22,10 +22,10 @@
 		</row>
 	</previousSiteSearches>
 	<pageMetrics>
-		<loops>1</loops>
-		<pageviews>17</pageviews>
+		<loops>2</loops>
+		<pageviews>18</pageviews>
 		<entries>4</entries>
-		<exits>3</exits>
+		<exits>2</exits>
 	</pageMetrics>
 	<followingPages>
 		<row>
@@ -44,6 +44,10 @@
 			<label>example.org/page3.html</label>
 			<referrals>1</referrals>
 		</row>
+		<row>
+			<label>example.org/page/search.html</label>
+			<referrals>1</referrals>
+		</row>
 	</followingPages>
 	<followingSiteSearches>
 		<row>
@@ -53,7 +57,7 @@
 	</followingSiteSearches>
 	<outlinks>
 		<row>
-			<label>https://anothersite.com/to/outlink/page.html</label>
+			<label>http://www.anothersite.com/to/outlink/page.html</label>
 			<referrals>1</referrals>
 		</row>
 		<row>
@@ -63,11 +67,11 @@
 	</outlinks>
 	<downloads>
 		<row>
-			<label>http://example.org/downloads/29.tar.gz</label>
+			<label>http://example.org/downloads/33.tar.gz</label>
 			<referrals>1</referrals>
 		</row>
 		<row>
-			<label>https://example.org/downloads/31.tar.gz</label>
+			<label>https://example.org/downloads/35.tar.gz</label>
 			<referrals>1</referrals>
 		</row>
 	</downloads>
diff --git a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml b/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml
index fd99b73f580b0a2fe5adb42954578881c783f18c..a7cd38066637238821c7b7191b337fc6214b4f95 100644
--- a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml
@@ -22,10 +22,10 @@
 		</row>
 	</previousSiteSearches>
 	<pageMetrics>
-		<loops>1</loops>
-		<pageviews>20</pageviews>
+		<loops>2</loops>
+		<pageviews>21</pageviews>
 		<entries>4</entries>
-		<exits>3</exits>
+		<exits>1</exits>
 	</pageMetrics>
 	<followingPages>
 		<row>
@@ -40,6 +40,10 @@
 			<label>example.org/the/third_page.html?foo=bar</label>
 			<referrals>2</referrals>
 		</row>
+		<row>
+			<label>example.org/page/search.html</label>
+			<referrals>2</referrals>
+		</row>
 		<row>
 			<label>example.org/page3.html</label>
 			<referrals>1</referrals>
@@ -53,7 +57,7 @@
 	</followingSiteSearches>
 	<outlinks>
 		<row>
-			<label>https://anothersite.com/to/outlink/page.html</label>
+			<label>http://www.anothersite.com/to/outlink/page.html</label>
 			<referrals>1</referrals>
 		</row>
 		<row>
@@ -61,21 +65,21 @@
 			<referrals>1</referrals>
 		</row>
 		<row>
-			<label>https://anothersite.com/to/another/outlink.html</label>
+			<label>http://anothersite.com/to/another/outlink.html</label>
 			<referrals>1</referrals>
 		</row>
 	</outlinks>
 	<downloads>
 		<row>
-			<label>http://example.org/downloads/29.tar.gz</label>
+			<label>http://example.org/downloads/33.tar.gz</label>
 			<referrals>1</referrals>
 		</row>
 		<row>
-			<label>https://example.org/downloads/31.tar.gz</label>
+			<label>https://example.org/downloads/35.tar.gz</label>
 			<referrals>1</referrals>
 		</row>
 		<row>
-			<label>http://www.example.org/downloads/38.tar.gz</label>
+			<label>https://example.org/downloads/43.tar.gz</label>
 			<referrals>1</referrals>
 		</row>
 	</downloads>
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
index 64f408608a90fb6d199698b34f053de2a7aa0ba0..b42f538c5002b787cf99b759fe9ad6f059233f32 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit 64f408608a90fb6d199698b34f053de2a7aa0ba0
+Subproject commit b42f538c5002b787cf99b759fe9ad6f059233f32