Add new config datatable_archiving_maximum_rows_site_search (#14112)

* Add new config datatable_archiving_maximum_rows_site_search to control number of rows archived for site search

* Fix hardcoding

* Use new datatable_archiving_maximum_rows_site_search query limit for archiveDayActions() only

* Split site search archiving out into a separate query

* Fix page actions archiving query

* Fix broken unit tests

* Fix broken unit tests

* Refactoring

* Unit test for new datatable_archiving_maximum_rows_site_search config setting

* Comments

26 files changed, 467 insertions, 192 deletions

diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php b/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php
index 1299a15939..acbc2a9c29 100644
--- a/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php
+++ b/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php
@@ -213,6 +213,11 @@ class ManyVisitsWithMockLocationProvider extends Fixture
             self::checkResponse($t->doTrackAction(is_null($actionNum) ? "http://othersite$visitorCounter.com/"
                 : "http://othersite$visitorCounter.com/$actionNum/", 'link'));
         }
+
+        // Add a site search to some visits
+        if (in_array($actionType, array('download', 'outlink'))) {
+            self::checkResponse($t->doTrackSiteSearch(is_null($actionNum) ? "keyword" : "keyword$actionNum"));
+        }
     }
 
     private function setMockLocationProvider()
diff --git a/tests/PHPUnit/System/BlobReportLimitingTest.php b/tests/PHPUnit/System/BlobReportLimitingTest.php
index 6d07101853..8373b012be 100644
--- a/tests/PHPUnit/System/BlobReportLimitingTest.php
+++ b/tests/PHPUnit/System/BlobReportLimitingTest.php
@@ -39,6 +39,7 @@ class BlobReportLimitingTest extends SystemTestCase
     {
         $apiToCall = array(
             'Actions.getPageUrls', 'Actions.getPageTitles', 'Actions.getDownloads', 'Actions.getOutlinks',
+            'Actions.getSiteSearchKeywords',
             'CustomVariables.getCustomVariables',
             'Referrers.getReferrerType', 'Referrers.getKeywords', 'Referrers.getSearchEngines',
             'Referrers.getWebsites', 'Referrers.getAll', /* TODO 'Referrers.getCampaigns', */
@@ -152,6 +153,7 @@ class BlobReportLimitingTest extends SystemTestCase
         $generalConfig['datatable_archiving_maximum_rows_custom_variables'] = 500;
         $generalConfig['datatable_archiving_maximum_rows_subtable_custom_variables'] = 500;
         $generalConfig['archiving_ranking_query_row_limit'] = 0;
+        $generalConfig['datatable_archiving_maximum_rows_site_search'] = 500;
 
         foreach ($this->getRankingQueryDisabledApiForTesting() as $pair) {
             list($apiToCall, $params) = $pair;
@@ -181,6 +183,8 @@ class BlobReportLimitingTest extends SystemTestCase
         $generalConfig['datatable_archiving_maximum_rows_subtable_actions'] = 2;
         $generalConfig['datatable_archiving_maximum_rows_standard'] = 3;
         $generalConfig['archiving_ranking_query_row_limit'] = 50000;
+        // Should be more than the datatable_archiving_maximum_rows_actions as code will take the max of these two 
+        $generalConfig['datatable_archiving_maximum_rows_site_search'] = 5;
     }
 }
 
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Actions.getSiteSearchKeywords_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Actions.getSiteSearchKeywords_day.xml
new file mode 100644
index 0000000000..5de252a5d0
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Actions.getSiteSearchKeywords_day.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>keyword</label>
+		<nb_visits>10</nb_visits>
+		<nb_hits>10</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<sum_bandwidth>0</sum_bandwidth>
+		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+		<min_bandwidth />
+		<max_bandwidth />
+		<exit_nb_visits>10</exit_nb_visits>
+		<nb_pages_per_search>1</nb_pages_per_search>
+		<avg_bandwidth>0</avg_bandwidth>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<segment>siteSearchKeyword==keyword</segment>
+	</row>
+	<row>
+		<label>keyword20</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>1</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<sum_bandwidth>0</sum_bandwidth>
+		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+		<min_bandwidth />
+		<max_bandwidth />
+		<exit_nb_visits>1</exit_nb_visits>
+		<nb_pages_per_search>1</nb_pages_per_search>
+		<avg_bandwidth>0</avg_bandwidth>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<segment>siteSearchKeyword==keyword20</segment>
+	</row>
+	<row>
+		<label>keyword21</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>1</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<sum_bandwidth>0</sum_bandwidth>
+		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+		<min_bandwidth />
+		<max_bandwidth />
+		<exit_nb_visits>1</exit_nb_visits>
+		<nb_pages_per_search>1</nb_pages_per_search>
+		<avg_bandwidth>0</avg_bandwidth>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<segment>siteSearchKeyword==keyword21</segment>
+	</row>
+	<row>
+		<label>keyword22</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>1</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<sum_bandwidth>0</sum_bandwidth>
+		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+		<min_bandwidth />
+		<max_bandwidth />
+		<exit_nb_visits>1</exit_nb_visits>
+		<nb_pages_per_search>1</nb_pages_per_search>
+		<avg_bandwidth>0</avg_bandwidth>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<segment>siteSearchKeyword==keyword22</segment>
+	</row>
+	<row>
+		<label>Others</label>
+		<nb_visits>37</nb_visits>
+		<nb_hits>37</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<sum_bandwidth>0</sum_bandwidth>
+		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+		<min_bandwidth />
+		<max_bandwidth />
+		<exit_nb_visits>37</exit_nb_visits>
+		<nb_pages_per_search>1</nb_pages_per_search>
+		<avg_bandwidth>0</avg_bandwidth>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml
index 945c55b1ac..7be41dee9b 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml
@@ -17,11 +17,11 @@
 		<label>Internet Explorer 9.0</label>
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
-		<nb_actions>15</nb_actions>
+		<nb_actions>30</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>15</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>15</sum_visit_length>
+		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>browserCode==IE;browserVersion==9.0</segment>
 		<logo>plugins/Morpheus/icons/dist/browsers/IE.png</logo>
@@ -30,11 +30,11 @@
 		<label>Others</label>
 		<nb_uniq_visitors>9</nb_uniq_visitors>
 		<nb_visits>45</nb_visits>
-		<nb_actions>45</nb_actions>
+		<nb_actions>80</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>45</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>35</sum_visit_length>
+		<bounce_count>10</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<logo>plugins/Morpheus/icons/dist/browsers/UNK.png</logo>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml
index 0d5db7195b..a2b38eefe5 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml
@@ -4,11 +4,11 @@
 		<label>GNU/Linux</label>
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
-		<nb_actions>20</nb_actions>
+		<nb_actions>25</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>20</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>5</sum_visit_length>
+		<bounce_count>15</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>operatingSystemCode==LIN;operatingSystemVersion==</segment>
 		<logo>plugins/Morpheus/icons/dist/os/LIN.png</logo>
@@ -17,11 +17,11 @@
 		<label>Android 4.0</label>
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
-		<nb_actions>15</nb_actions>
+		<nb_actions>30</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>15</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>15</sum_visit_length>
+		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>operatingSystemCode==AND;operatingSystemVersion==4.0</segment>
 		<logo>plugins/Morpheus/icons/dist/os/AND.png</logo>
@@ -30,11 +30,11 @@
 		<label>Others</label>
 		<nb_uniq_visitors>8</nb_uniq_visitors>
 		<nb_visits>40</nb_visits>
-		<nb_actions>40</nb_actions>
+		<nb_actions>70</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>40</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>30</sum_visit_length>
+		<bounce_count>10</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<logo>plugins/Morpheus/icons/dist/os/UNK.png</logo>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml
index 61f5ff50c5..77a90f4be6 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml
@@ -4,11 +4,11 @@
 		<label>Direct Entry</label>
 		<nb_uniq_visitors>15</nb_uniq_visitors>
 		<nb_visits>55</nb_visits>
-		<nb_actions>55</nb_actions>
+		<nb_actions>105</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>55</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>50</sum_visit_length>
+		<bounce_count>5</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>referrerType==direct</segment>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getConfiguration_day.xml
index b90214c2e9..ccfbc39c4f 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getConfiguration_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getConfiguration_day.xml
@@ -15,22 +15,22 @@
 		<label>Android / Chrome / 1280x1024</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>5</nb_visits>
-		<nb_actions>5</nb_actions>
+		<nb_actions>10</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>5</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>5</sum_visit_length>
+		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 	</row>
 	<row>
 		<label>Others</label>
 		<nb_uniq_visitors>12</nb_uniq_visitors>
 		<nb_visits>60</nb_visits>
-		<nb_actions>60</nb_actions>
+		<nb_actions>105</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>60</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>45</sum_visit_length>
+		<bounce_count>15</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getResolution_day.xml
index 70e4bab0ff..65ff214a8d 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getResolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getResolution_day.xml
@@ -16,11 +16,11 @@
 		<label>1280x1024</label>
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
-		<nb_actions>15</nb_actions>
+		<nb_actions>30</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>15</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>15</sum_visit_length>
+		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>resolution==1280x1024</segment>
 	</row>
@@ -28,11 +28,11 @@
 		<label>Others</label>
 		<nb_uniq_visitors>8</nb_uniq_visitors>
 		<nb_visits>40</nb_visits>
-		<nb_actions>40</nb_actions>
+		<nb_actions>75</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>40</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>35</sum_visit_length>
+		<bounce_count>5</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml
index 85c4dfe4a5..428e20c3cc 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml
@@ -4,11 +4,11 @@
 		<label>Melbourne, Victoria, Australia</label>
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
-		<nb_actions>20</nb_actions>
+		<nb_actions>35</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>20</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>15</sum_visit_length>
+		<bounce_count>5</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>city==Melbourne;regionCode==VIC;countryCode==au</segment>
 		<city_name>Melbourne</city_name>
@@ -22,11 +22,11 @@
 		<label>Nice, Provence-Alpes-Côte-d’Azur, France</label>
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
-		<nb_actions>20</nb_actions>
+		<nb_actions>35</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>20</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>15</sum_visit_length>
+		<bounce_count>5</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>city==Nice;regionCode==PAC;countryCode==fr</segment>
 		<city_name>Nice</city_name>
@@ -40,11 +40,11 @@
 		<label>Others</label>
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>35</nb_visits>
-		<nb_actions>35</nb_actions>
+		<nb_actions>55</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>35</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>20</sum_visit_length>
+		<bounce_count>15</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<logo>plugins/Morpheus/icons/dist/flags/xx.png</logo>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml
index ba3312d821..59bacbe3d1 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml
@@ -4,11 +4,11 @@
 		<label>Ontario, Canada</label>
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
-		<nb_actions>20</nb_actions>
+		<nb_actions>30</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>20</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>10</sum_visit_length>
+		<bounce_count>10</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>regionCode==ON;countryCode==ca</segment>
 		<region>ON</region>
@@ -21,11 +21,11 @@
 		<label>Provence-Alpes-Côte-d’Azur, France</label>
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
-		<nb_actions>20</nb_actions>
+		<nb_actions>35</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>20</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>15</sum_visit_length>
+		<bounce_count>5</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>regionCode==PAC;countryCode==fr</segment>
 		<region>PAC</region>
@@ -38,11 +38,11 @@
 		<label>Others</label>
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>35</nb_visits>
-		<nb_actions>35</nb_actions>
+		<nb_actions>60</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>35</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>25</sum_visit_length>
+		<bounce_count>10</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<logo>plugins/Morpheus/icons/dist/flags/xx.png</logo>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getSiteSearchKeywords_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getSiteSearchKeywords_day.xml
new file mode 100644
index 0000000000..c7326b2fad
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getSiteSearchKeywords_day.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+    <row>
+        <label>Others</label>
+        <nb_visits>37</nb_visits>
+        <nb_hits>37</nb_hits>
+        <sum_time_spent>0</sum_time_spent>
+        <sum_bandwidth>0</sum_bandwidth>
+        <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+        <min_bandwidth />
+        <max_bandwidth />
+        <exit_nb_visits>37</exit_nb_visits>
+        <nb_pages_per_search>1</nb_pages_per_search>
+        <avg_bandwidth>0</avg_bandwidth>
+        <avg_time_on_page>0</avg_time_on_page>
+        <bounce_rate>0%</bounce_rate>
+        <exit_rate>100%</exit_rate>
+        <Actions_Keyword>Others</Actions_Keyword>
+    </row>
+    <row>
+        <label>keyword</label>
+        <nb_visits>10</nb_visits>
+        <nb_hits>10</nb_hits>
+        <sum_time_spent>0</sum_time_spent>
+        <sum_bandwidth>0</sum_bandwidth>
+        <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+        <min_bandwidth />
+        <max_bandwidth />
+        <exit_nb_visits>10</exit_nb_visits>
+        <nb_pages_per_search>1</nb_pages_per_search>
+        <avg_bandwidth>0</avg_bandwidth>
+        <avg_time_on_page>0</avg_time_on_page>
+        <bounce_rate>0%</bounce_rate>
+        <exit_rate>100%</exit_rate>
+        <segment>siteSearchKeyword==keyword</segment>
+        <Actions_Keyword>keyword</Actions_Keyword>
+    </row>
+    <row>
+        <label>keyword20</label>
+        <nb_visits>1</nb_visits>
+        <nb_hits>1</nb_hits>
+        <sum_time_spent>0</sum_time_spent>
+        <sum_bandwidth>0</sum_bandwidth>
+        <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+        <min_bandwidth />
+        <max_bandwidth />
+        <exit_nb_visits>1</exit_nb_visits>
+        <nb_pages_per_search>1</nb_pages_per_search>
+        <avg_bandwidth>0</avg_bandwidth>
+        <avg_time_on_page>0</avg_time_on_page>
+        <bounce_rate>0%</bounce_rate>
+        <exit_rate>100%</exit_rate>
+        <segment>siteSearchKeyword==keyword20</segment>
+        <Actions_Keyword>keyword20</Actions_Keyword>
+    </row>
+    <row>
+        <label>keyword21</label>
+        <nb_visits>1</nb_visits>
+        <nb_hits>1</nb_hits>
+        <sum_time_spent>0</sum_time_spent>
+        <sum_bandwidth>0</sum_bandwidth>
+        <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+        <min_bandwidth />
+        <max_bandwidth />
+        <exit_nb_visits>1</exit_nb_visits>
+        <nb_pages_per_search>1</nb_pages_per_search>
+        <avg_bandwidth>0</avg_bandwidth>
+        <avg_time_on_page>0</avg_time_on_page>
+        <bounce_rate>0%</bounce_rate>
+        <exit_rate>100%</exit_rate>
+        <segment>siteSearchKeyword==keyword21</segment>
+        <Actions_Keyword>keyword21</Actions_Keyword>
+    </row>
+    <row>
+        <label>keyword22</label>
+        <nb_visits>1</nb_visits>
+        <nb_hits>1</nb_hits>
+        <sum_time_spent>0</sum_time_spent>
+        <sum_bandwidth>0</sum_bandwidth>
+        <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+        <min_bandwidth />
+        <max_bandwidth />
+        <exit_nb_visits>1</exit_nb_visits>
+        <nb_pages_per_search>1</nb_pages_per_search>
+        <avg_bandwidth>0</avg_bandwidth>
+        <avg_time_on_page>0</avg_time_on_page>
+        <bounce_rate>0%</bounce_rate>
+        <exit_rate>100%</exit_rate>
+        <segment>siteSearchKeyword==keyword22</segment>
+        <Actions_Keyword>keyword22</Actions_Keyword>
+    </row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml
index 11cc1802e3..4462b4428e 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml
@@ -4,11 +4,11 @@
 		<label>Others</label>
 		<nb_uniq_visitors>9</nb_uniq_visitors>
 		<nb_visits>45</nb_visits>
-		<nb_actions>45</nb_actions>
+		<nb_actions>80</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>45</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>35</sum_visit_length>
+		<bounce_count>10</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<logo>plugins/Morpheus/icons/dist/browsers/UNK.png</logo>
 		<DevicesDetection_BrowserVersion>Others</DevicesDetection_BrowserVersion>
@@ -31,11 +31,11 @@
 		<label>Internet Explorer 9.0</label>
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
-		<nb_actions>15</nb_actions>
+		<nb_actions>30</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>15</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>15</sum_visit_length>
+		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>browserCode==IE;browserVersion==9.0</segment>
 		<logo>plugins/Morpheus/icons/dist/browsers/IE.png</logo>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml
index 22266be912..a356234a08 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml
@@ -4,11 +4,11 @@
 		<label>Others</label>
 		<nb_uniq_visitors>8</nb_uniq_visitors>
 		<nb_visits>40</nb_visits>
-		<nb_actions>40</nb_actions>
+		<nb_actions>70</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>40</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>30</sum_visit_length>
+		<bounce_count>10</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<logo>plugins/Morpheus/icons/dist/os/UNK.png</logo>
 		<DevicesDetection_OsVersion>Others</DevicesDetection_OsVersion>
@@ -17,11 +17,11 @@
 		<label>GNU/Linux</label>
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
-		<nb_actions>20</nb_actions>
+		<nb_actions>25</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>20</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>5</sum_visit_length>
+		<bounce_count>15</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>operatingSystemCode==LIN;operatingSystemVersion==</segment>
 		<logo>plugins/Morpheus/icons/dist/os/LIN.png</logo>
@@ -31,11 +31,11 @@
 		<label>Android 4.0</label>
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
-		<nb_actions>15</nb_actions>
+		<nb_actions>30</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>15</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>15</sum_visit_length>
+		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>operatingSystemCode==AND;operatingSystemVersion==4.0</segment>
 		<logo>plugins/Morpheus/icons/dist/os/AND.png</logo>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml
index e8636937d0..1905f3e1e3 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml
@@ -4,11 +4,11 @@
 		<label>Direct Entry</label>
 		<nb_uniq_visitors>15</nb_uniq_visitors>
 		<nb_visits>55</nb_visits>
-		<nb_actions>55</nb_actions>
+		<nb_actions>105</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>55</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>50</sum_visit_length>
+		<bounce_count>5</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>referrerType==direct</segment>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getConfiguration_day.xml
index 3225691b31..aa4dd45835 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getConfiguration_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getConfiguration_day.xml
@@ -4,11 +4,11 @@
 		<label>Others</label>
 		<nb_uniq_visitors>12</nb_uniq_visitors>
 		<nb_visits>60</nb_visits>
-		<nb_actions>60</nb_actions>
+		<nb_actions>105</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>60</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>45</sum_visit_length>
+		<bounce_count>15</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<Resolution_Configuration>Others</Resolution_Configuration>
 	</row>
@@ -28,11 +28,11 @@
 		<label>Android / Chrome / 1280x1024</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>5</nb_visits>
-		<nb_actions>5</nb_actions>
+		<nb_actions>10</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>5</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>5</sum_visit_length>
+		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<Resolution_Configuration>AND;CH;1280x1024</Resolution_Configuration>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getResolution_day.xml
index 6896b04404..97ba64717f 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getResolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getResolution_day.xml
@@ -4,11 +4,11 @@
 		<label>Others</label>
 		<nb_uniq_visitors>8</nb_uniq_visitors>
 		<nb_visits>40</nb_visits>
-		<nb_actions>40</nb_actions>
+		<nb_actions>75</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>40</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>35</sum_visit_length>
+		<bounce_count>5</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<Resolution_Resolution>Others</Resolution_Resolution>
 	</row>
@@ -29,11 +29,11 @@
 		<label>1280x1024</label>
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
-		<nb_actions>15</nb_actions>
+		<nb_actions>30</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>15</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>15</sum_visit_length>
+		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<Resolution_Resolution>1280x1024</Resolution_Resolution>
 		<segment>resolution==1280x1024</segment>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml
index 9e5db431e0..d743c41b62 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml
@@ -4,11 +4,11 @@
 		<label>Others</label>
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>35</nb_visits>
-		<nb_actions>35</nb_actions>
+		<nb_actions>55</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>35</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>20</sum_visit_length>
+		<bounce_count>15</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<logo>plugins/Morpheus/icons/dist/flags/xx.png</logo>
 		<UserCountry_City>Others</UserCountry_City>
@@ -17,11 +17,11 @@
 		<label>Melbourne, Victoria, Australia</label>
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
-		<nb_actions>20</nb_actions>
+		<nb_actions>35</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>20</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>15</sum_visit_length>
+		<bounce_count>5</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>city==Melbourne;regionCode==VIC;countryCode==au</segment>
 		<city_name>Melbourne</city_name>
@@ -36,11 +36,11 @@
 		<label>Nice, Provence-Alpes-Côte-d’Azur, France</label>
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
-		<nb_actions>20</nb_actions>
+		<nb_actions>35</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>20</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>15</sum_visit_length>
+		<bounce_count>5</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>city==Nice;regionCode==PAC;countryCode==fr</segment>
 		<city_name>Nice</city_name>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml
index 090b2c0243..b3fafd427d 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml
@@ -4,11 +4,11 @@
 		<label>Others</label>
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>35</nb_visits>
-		<nb_actions>35</nb_actions>
+		<nb_actions>60</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>35</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>25</sum_visit_length>
+		<bounce_count>10</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<logo>plugins/Morpheus/icons/dist/flags/xx.png</logo>
 		<UserCountry_Region>Others</UserCountry_Region>
@@ -17,11 +17,11 @@
 		<label>Ontario, Canada</label>
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
-		<nb_actions>20</nb_actions>
+		<nb_actions>30</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>20</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>10</sum_visit_length>
+		<bounce_count>10</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>regionCode==ON;countryCode==ca</segment>
 		<region>ON</region>
@@ -35,11 +35,11 @@
 		<label>Provence-Alpes-Côte-d’Azur, France</label>
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
-		<nb_actions>20</nb_actions>
+		<nb_actions>35</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>20</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>15</sum_visit_length>
+		<bounce_count>5</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>regionCode==PAC;countryCode==fr</segment>
 		<region>PAC</region>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Actions.getSiteSearchKeywords_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Actions.getSiteSearchKeywords_day.xml
new file mode 100644
index 0000000000..02374d8de4
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Actions.getSiteSearchKeywords_day.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+    <row>
+        <label>keyword</label>
+        <nb_visits>10</nb_visits>
+        <nb_hits>10</nb_hits>
+        <sum_time_spent>0</sum_time_spent>
+        <sum_bandwidth>0</sum_bandwidth>
+        <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+        <min_bandwidth />
+        <max_bandwidth />
+        <exit_nb_visits>10</exit_nb_visits>
+        <nb_pages_per_search>1</nb_pages_per_search>
+        <avg_bandwidth>0</avg_bandwidth>
+        <avg_time_on_page>0</avg_time_on_page>
+        <bounce_rate>0%</bounce_rate>
+        <exit_rate>100%</exit_rate>
+        <segment>siteSearchKeyword==keyword</segment>
+    </row>
+    <row>
+        <label>keyword20</label>
+        <nb_visits>1</nb_visits>
+        <nb_hits>1</nb_hits>
+        <sum_time_spent>0</sum_time_spent>
+        <sum_bandwidth>0</sum_bandwidth>
+        <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+        <min_bandwidth />
+        <max_bandwidth />
+        <exit_nb_visits>1</exit_nb_visits>
+        <nb_pages_per_search>1</nb_pages_per_search>
+        <avg_bandwidth>0</avg_bandwidth>
+        <avg_time_on_page>0</avg_time_on_page>
+        <bounce_rate>0%</bounce_rate>
+        <exit_rate>100%</exit_rate>
+        <segment>siteSearchKeyword==keyword20</segment>
+    </row>
+    <row>
+        <label>keyword21</label>
+        <nb_visits>1</nb_visits>
+        <nb_hits>1</nb_hits>
+        <sum_time_spent>0</sum_time_spent>
+        <sum_bandwidth>0</sum_bandwidth>
+        <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+        <min_bandwidth />
+        <max_bandwidth />
+        <exit_nb_visits>1</exit_nb_visits>
+        <nb_pages_per_search>1</nb_pages_per_search>
+        <avg_bandwidth>0</avg_bandwidth>
+        <avg_time_on_page>0</avg_time_on_page>
+        <bounce_rate>0%</bounce_rate>
+        <exit_rate>100%</exit_rate>
+        <segment>siteSearchKeyword==keyword21</segment>
+    </row>
+    <row>
+        <label>keyword22</label>
+        <nb_visits>1</nb_visits>
+        <nb_hits>1</nb_hits>
+        <sum_time_spent>0</sum_time_spent>
+        <sum_bandwidth>0</sum_bandwidth>
+        <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+        <min_bandwidth />
+        <max_bandwidth />
+        <exit_nb_visits>1</exit_nb_visits>
+        <nb_pages_per_search>1</nb_pages_per_search>
+        <avg_bandwidth>0</avg_bandwidth>
+        <avg_time_on_page>0</avg_time_on_page>
+        <bounce_rate>0%</bounce_rate>
+        <exit_rate>100%</exit_rate>
+        <segment>siteSearchKeyword==keyword22</segment>
+    </row>
+    <row>
+        <label>Others</label>
+        <nb_visits>37</nb_visits>
+        <nb_hits>37</nb_hits>
+        <sum_time_spent>0</sum_time_spent>
+        <sum_bandwidth>0</sum_bandwidth>
+        <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+        <min_bandwidth />
+        <max_bandwidth />
+        <exit_nb_visits>37</exit_nb_visits>
+        <nb_pages_per_search>1</nb_pages_per_search>
+        <avg_bandwidth>0</avg_bandwidth>
+        <avg_time_on_page>0</avg_time_on_page>
+        <bounce_rate>0%</bounce_rate>
+        <exit_rate>100%</exit_rate>
+    </row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml
index 945c55b1ac..7be41dee9b 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml
@@ -17,11 +17,11 @@
 		<label>Internet Explorer 9.0</label>
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
-		<nb_actions>15</nb_actions>
+		<nb_actions>30</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>15</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>15</sum_visit_length>
+		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>browserCode==IE;browserVersion==9.0</segment>
 		<logo>plugins/Morpheus/icons/dist/browsers/IE.png</logo>
@@ -30,11 +30,11 @@
 		<label>Others</label>
 		<nb_uniq_visitors>9</nb_uniq_visitors>
 		<nb_visits>45</nb_visits>
-		<nb_actions>45</nb_actions>
+		<nb_actions>80</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>45</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>35</sum_visit_length>
+		<bounce_count>10</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<logo>plugins/Morpheus/icons/dist/browsers/UNK.png</logo>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml
index 0d5db7195b..a2b38eefe5 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml
@@ -4,11 +4,11 @@
 		<label>GNU/Linux</label>
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
-		<nb_actions>20</nb_actions>
+		<nb_actions>25</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>20</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>5</sum_visit_length>
+		<bounce_count>15</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>operatingSystemCode==LIN;operatingSystemVersion==</segment>
 		<logo>plugins/Morpheus/icons/dist/os/LIN.png</logo>
@@ -17,11 +17,11 @@
 		<label>Android 4.0</label>
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
-		<nb_actions>15</nb_actions>
+		<nb_actions>30</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>15</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>15</sum_visit_length>
+		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>operatingSystemCode==AND;operatingSystemVersion==4.0</segment>
 		<logo>plugins/Morpheus/icons/dist/os/AND.png</logo>
@@ -30,11 +30,11 @@
 		<label>Others</label>
 		<nb_uniq_visitors>8</nb_uniq_visitors>
 		<nb_visits>40</nb_visits>
-		<nb_actions>40</nb_actions>
+		<nb_actions>70</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>40</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>30</sum_visit_length>
+		<bounce_count>10</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<logo>plugins/Morpheus/icons/dist/os/UNK.png</logo>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml
index 61f5ff50c5..77a90f4be6 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml
@@ -4,11 +4,11 @@
 		<label>Direct Entry</label>
 		<nb_uniq_visitors>15</nb_uniq_visitors>
 		<nb_visits>55</nb_visits>
-		<nb_actions>55</nb_actions>
+		<nb_actions>105</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>55</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>50</sum_visit_length>
+		<bounce_count>5</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>referrerType==direct</segment>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getConfiguration_day.xml
index b90214c2e9..ccfbc39c4f 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getConfiguration_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getConfiguration_day.xml
@@ -15,22 +15,22 @@
 		<label>Android / Chrome / 1280x1024</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>5</nb_visits>
-		<nb_actions>5</nb_actions>
+		<nb_actions>10</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>5</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>5</sum_visit_length>
+		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 	</row>
 	<row>
 		<label>Others</label>
 		<nb_uniq_visitors>12</nb_uniq_visitors>
 		<nb_visits>60</nb_visits>
-		<nb_actions>60</nb_actions>
+		<nb_actions>105</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>60</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>45</sum_visit_length>
+		<bounce_count>15</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getResolution_day.xml
index 70e4bab0ff..65ff214a8d 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getResolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getResolution_day.xml
@@ -16,11 +16,11 @@
 		<label>1280x1024</label>
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
-		<nb_actions>15</nb_actions>
+		<nb_actions>30</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>15</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>15</sum_visit_length>
+		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>resolution==1280x1024</segment>
 	</row>
@@ -28,11 +28,11 @@
 		<label>Others</label>
 		<nb_uniq_visitors>8</nb_uniq_visitors>
 		<nb_visits>40</nb_visits>
-		<nb_actions>40</nb_actions>
+		<nb_actions>75</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>40</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>35</sum_visit_length>
+		<bounce_count>5</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml
index 85c4dfe4a5..428e20c3cc 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml
@@ -4,11 +4,11 @@
 		<label>Melbourne, Victoria, Australia</label>
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
-		<nb_actions>20</nb_actions>
+		<nb_actions>35</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>20</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>15</sum_visit_length>
+		<bounce_count>5</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>city==Melbourne;regionCode==VIC;countryCode==au</segment>
 		<city_name>Melbourne</city_name>
@@ -22,11 +22,11 @@
 		<label>Nice, Provence-Alpes-Côte-d’Azur, France</label>
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
-		<nb_actions>20</nb_actions>
+		<nb_actions>35</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>20</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>15</sum_visit_length>
+		<bounce_count>5</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>city==Nice;regionCode==PAC;countryCode==fr</segment>
 		<city_name>Nice</city_name>
@@ -40,11 +40,11 @@
 		<label>Others</label>
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>35</nb_visits>
-		<nb_actions>35</nb_actions>
+		<nb_actions>55</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>35</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>20</sum_visit_length>
+		<bounce_count>15</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<logo>plugins/Morpheus/icons/dist/flags/xx.png</logo>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml
index ba3312d821..59bacbe3d1 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml
@@ -4,11 +4,11 @@
 		<label>Ontario, Canada</label>
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
-		<nb_actions>20</nb_actions>
+		<nb_actions>30</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>20</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>10</sum_visit_length>
+		<bounce_count>10</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>regionCode==ON;countryCode==ca</segment>
 		<region>ON</region>
@@ -21,11 +21,11 @@
 		<label>Provence-Alpes-Côte-d’Azur, France</label>
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
-		<nb_actions>20</nb_actions>
+		<nb_actions>35</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>20</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>15</sum_visit_length>
+		<bounce_count>5</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>regionCode==PAC;countryCode==fr</segment>
 		<region>PAC</region>
@@ -38,11 +38,11 @@
 		<label>Others</label>
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>35</nb_visits>
-		<nb_actions>35</nb_actions>
+		<nb_actions>60</nb_actions>
 		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>35</bounce_count>
+		<max_actions>2</max_actions>
+		<sum_visit_length>25</sum_visit_length>
+		<bounce_count>10</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<logo>plugins/Morpheus/icons/dist/flags/xx.png</logo>
 	</row>