Use ranking query on userid reports. (#14551)

* Use ranking query on userid reports.

* Fix test ordering on travis.

* Use existing userid row limit config option and deal w/ ranking query summary row which is not treated as datatable summary row.

* update system test

* another test update

* Add order by to get test to pass.

37 files changed, 264 insertions, 147 deletions

diff --git a/tests/PHPUnit/System/BlobReportLimitingTest.php b/tests/PHPUnit/System/BlobReportLimitingTest.php
index b55eb336e7..dead72d240 100644
--- a/tests/PHPUnit/System/BlobReportLimitingTest.php
+++ b/tests/PHPUnit/System/BlobReportLimitingTest.php
@@ -46,6 +46,7 @@ class BlobReportLimitingTest extends SystemTestCase
             'Resolution.getResolution', 'Resolution.getConfiguration', 'DevicesDetection.getOsVersions',
             'DevicesDetection.getBrowserVersions',
             'UserCountry.getRegion', 'UserCountry.getCity',
+            'UserId.getUsers',
         );
 
         $ecommerceApi = array('Goals.getItemsSku', 'Goals.getItemsName', 'Goals.getItemsCategory');
@@ -156,6 +157,7 @@ class BlobReportLimitingTest extends SystemTestCase
         $generalConfig['datatable_archiving_maximum_rows_subtable_custom_variables'] = 500;
         $generalConfig['archiving_ranking_query_row_limit'] = 0;
         $generalConfig['datatable_archiving_maximum_rows_site_search'] = 500;
+        $generalConfig['datatable_archiving_maximum_rows_userid_users'] = 500;
 
         foreach ($this->getRankingQueryDisabledApiForTesting() as $pair) {
             list($apiToCall, $params) = $pair;
@@ -184,6 +186,7 @@ class BlobReportLimitingTest extends SystemTestCase
         $generalConfig['datatable_archiving_maximum_rows_subtable_custom_variables'] = 2;
         $generalConfig['datatable_archiving_maximum_rows_subtable_actions'] = 2;
         $generalConfig['datatable_archiving_maximum_rows_standard'] = 3;
+        $generalConfig['datatable_archiving_maximum_rows_userid_users'] = 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__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml
index 7be41dee9b..68bc8eb2bf 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
 		<nb_actions>15</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>15</bounce_count>
@@ -18,7 +18,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
 		<nb_actions>30</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>15</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -31,7 +31,7 @@
 		<nb_uniq_visitors>9</nb_uniq_visitors>
 		<nb_visits>45</nb_visits>
 		<nb_actions>80</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>9</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>35</sum_visit_length>
 		<bounce_count>10</bounce_count>
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 a2b38eefe5..d2c4507d0a 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>25</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>4</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>5</sum_visit_length>
 		<bounce_count>15</bounce_count>
@@ -18,7 +18,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
 		<nb_actions>30</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>15</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -31,7 +31,7 @@
 		<nb_uniq_visitors>8</nb_uniq_visitors>
 		<nb_visits>40</nb_visits>
 		<nb_actions>70</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>8</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>30</sum_visit_length>
 		<bounce_count>10</bounce_count>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getAll_day.xml
index 7c56dfa121..52be85572a 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getAll_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getAll_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>4</nb_visits>
 		<nb_actions>4</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>4</bounce_count>
@@ -17,7 +17,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>3</bounce_count>
@@ -29,7 +29,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>2</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -41,7 +41,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>2</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -53,7 +53,7 @@
 		<nb_uniq_visitors>9</nb_uniq_visitors>
 		<nb_visits>9</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>9</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>9</bounce_count>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getKeywords_day.xml
index 10af9e9721..2701dce935 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getKeywords_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>3</bounce_count>
@@ -17,7 +17,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>1</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -28,7 +28,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>2</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -41,7 +41,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>2</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -53,7 +53,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>1</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -64,7 +64,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>1</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -77,7 +77,7 @@
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>7</nb_visits>
 		<nb_actions>7</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>7</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>7</bounce_count>
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 77a90f4be6..ec284472ff 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>15</nb_uniq_visitors>
 		<nb_visits>55</nb_visits>
 		<nb_actions>105</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>15</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>50</sum_visit_length>
 		<bounce_count>5</bounce_count>
@@ -17,7 +17,7 @@
 		<nb_uniq_visitors>12</nb_uniq_visitors>
 		<nb_visits>12</nb_visits>
 		<nb_actions>12</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>12</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>12</bounce_count>
@@ -29,7 +29,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>2</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -40,7 +40,7 @@
 				<nb_uniq_visitors>3</nb_uniq_visitors>
 				<nb_visits>3</nb_visits>
 				<nb_actions>3</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>3</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>3</bounce_count>
@@ -51,7 +51,7 @@
 				<nb_uniq_visitors>7</nb_uniq_visitors>
 				<nb_visits>7</nb_visits>
 				<nb_actions>7</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>7</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>7</bounce_count>
@@ -64,7 +64,7 @@
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>8</nb_visits>
 		<nb_actions>8</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>7</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>8</bounce_count>
@@ -76,7 +76,7 @@
 				<nb_uniq_visitors>3</nb_uniq_visitors>
 				<nb_visits>4</nb_visits>
 				<nb_actions>4</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>3</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>4</bounce_count>
@@ -87,7 +87,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>2</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -98,7 +98,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>2</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml
index 4e00626c24..d89b5a581d 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>3</bounce_count>
@@ -19,7 +19,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>1</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -30,7 +30,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>2</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -43,7 +43,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>3</bounce_count>
@@ -57,7 +57,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>1</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -68,7 +68,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>2</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -81,7 +81,7 @@
 		<nb_uniq_visitors>6</nb_uniq_visitors>
 		<nb_visits>6</nb_visits>
 		<nb_actions>6</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>6</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>6</bounce_count>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getWebsites_day.xml
index cb46ea8f5f..e0fd222b3f 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getWebsites_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>4</nb_visits>
 		<nb_actions>4</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>4</bounce_count>
@@ -17,7 +17,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>1</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -28,7 +28,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>2</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -41,7 +41,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>2</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -53,7 +53,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>1</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -64,7 +64,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>1</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -77,7 +77,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>2</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
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 ccfbc39c4f..a0d208c1a1 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getConfiguration_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getConfiguration_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>10</nb_visits>
 		<nb_actions>10</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>2</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>10</bounce_count>
@@ -16,7 +16,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>5</nb_visits>
 		<nb_actions>10</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>1</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>5</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -27,7 +27,7 @@
 		<nb_uniq_visitors>12</nb_uniq_visitors>
 		<nb_visits>60</nb_visits>
 		<nb_actions>105</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>12</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>45</sum_visit_length>
 		<bounce_count>15</bounce_count>
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 65ff214a8d..1e7ffb2bf9 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getResolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getResolution_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>20</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>4</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
@@ -17,7 +17,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
 		<nb_actions>30</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>15</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -29,7 +29,7 @@
 		<nb_uniq_visitors>8</nb_uniq_visitors>
 		<nb_visits>40</nb_visits>
 		<nb_actions>75</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>8</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>35</sum_visit_length>
 		<bounce_count>5</bounce_count>
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 428e20c3cc..378a6b593b 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>35</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>4</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>15</sum_visit_length>
 		<bounce_count>5</bounce_count>
@@ -23,7 +23,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>35</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>4</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>15</sum_visit_length>
 		<bounce_count>5</bounce_count>
@@ -41,7 +41,7 @@
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>35</nb_visits>
 		<nb_actions>55</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>7</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>20</sum_visit_length>
 		<bounce_count>15</bounce_count>
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 59bacbe3d1..edfaa10ed9 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>30</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>4</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>10</sum_visit_length>
 		<bounce_count>10</bounce_count>
@@ -22,7 +22,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>35</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>4</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>15</sum_visit_length>
 		<bounce_count>5</bounce_count>
@@ -39,7 +39,7 @@
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>35</nb_visits>
 		<nb_actions>60</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>7</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>25</sum_visit_length>
 		<bounce_count>10</bounce_count>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserId.getUsers_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserId.getUsers_day.xml
new file mode 100644
index 0000000000..acd3f282fa
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserId.getUsers_day.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>user0</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>5</nb_visits>
+		<nb_actions>5</nb_actions>
+		<nb_users>1</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>5</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		
+	</row>
+	<row>
+		<label>user1</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>5</nb_visits>
+		<nb_actions>5</nb_actions>
+		<nb_users>1</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>5</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		
+	</row>
+	<row>
+		<label>Others</label>
+		<nb_uniq_visitors>13</nb_uniq_visitors>
+		<nb_visits>65</nb_visits>
+		<nb_actions>115</nb_actions>
+		<nb_users>13</nb_users>
+		<max_actions>2</max_actions>
+		<sum_visit_length>50</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_flattened__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml
index 188899636a..dc0cc13c20 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
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>9</nb_uniq_visitors>
 		<nb_visits>45</nb_visits>
 		<nb_actions>80</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>9</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>35</sum_visit_length>
 		<bounce_count>10</bounce_count>
@@ -19,7 +19,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
 		<nb_actions>15</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>15</bounce_count>
@@ -33,7 +33,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
 		<nb_actions>30</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>15</sum_visit_length>
 		<bounce_count>0</bounce_count>
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 9980a0f955..41afe8920e 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
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>8</nb_uniq_visitors>
 		<nb_visits>40</nb_visits>
 		<nb_actions>70</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>8</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>30</sum_visit_length>
 		<bounce_count>10</bounce_count>
@@ -19,7 +19,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>25</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>4</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>5</sum_visit_length>
 		<bounce_count>15</bounce_count>
@@ -33,7 +33,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
 		<nb_actions>30</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>15</sum_visit_length>
 		<bounce_count>0</bounce_count>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getAll_day.xml
index 62d4e0246d..f00d41d063 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getAll_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getAll_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>9</nb_uniq_visitors>
 		<nb_visits>9</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>9</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>9</bounce_count>
@@ -18,7 +18,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>4</nb_visits>
 		<nb_actions>4</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>4</bounce_count>
@@ -31,7 +31,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>3</bounce_count>
@@ -44,7 +44,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>2</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -57,7 +57,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>2</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml
index b7c3e0cd22..1b9490979f 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>7</nb_visits>
 		<nb_actions>7</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>7</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>7</bounce_count>
@@ -18,7 +18,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>2</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -33,7 +33,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>1</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
@@ -48,7 +48,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>1</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
@@ -63,7 +63,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>1</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
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 1905f3e1e3..dc4a076fa9 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
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>15</nb_uniq_visitors>
 		<nb_visits>55</nb_visits>
 		<nb_actions>105</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>15</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>50</sum_visit_length>
 		<bounce_count>5</bounce_count>
@@ -17,7 +17,7 @@
 		<nb_uniq_visitors>12</nb_uniq_visitors>
 		<nb_visits>12</nb_visits>
 		<nb_actions>12</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>12</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>12</bounce_count>
@@ -29,7 +29,7 @@
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>8</nb_visits>
 		<nb_actions>8</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>7</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>8</bounce_count>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml
index cdb5c36986..99f2cd2bff 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>6</nb_uniq_visitors>
 		<nb_visits>6</nb_visits>
 		<nb_actions>6</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>6</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>6</bounce_count>
@@ -19,7 +19,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>2</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -34,7 +34,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>2</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -49,7 +49,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>1</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
@@ -64,7 +64,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>1</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml
index 739307c0f9..ab153c3ec6 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>2</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -18,7 +18,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>2</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -32,7 +32,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>1</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -46,7 +46,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>1</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
@@ -60,7 +60,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>1</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
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 4231a73dea..c216d6c8e5 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
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>12</nb_uniq_visitors>
 		<nb_visits>60</nb_visits>
 		<nb_actions>105</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>12</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>45</sum_visit_length>
 		<bounce_count>15</bounce_count>
@@ -18,7 +18,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>10</nb_visits>
 		<nb_actions>10</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>2</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>10</bounce_count>
@@ -30,7 +30,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>5</nb_visits>
 		<nb_actions>10</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>1</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>5</sum_visit_length>
 		<bounce_count>0</bounce_count>
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 47c523ddd6..4753d131a3 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
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>8</nb_uniq_visitors>
 		<nb_visits>40</nb_visits>
 		<nb_actions>75</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>8</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>35</sum_visit_length>
 		<bounce_count>5</bounce_count>
@@ -18,7 +18,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>20</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>4</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
@@ -31,7 +31,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
 		<nb_actions>30</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>15</sum_visit_length>
 		<bounce_count>0</bounce_count>
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 98c7c05653..8ae658d9ab 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
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>35</nb_visits>
 		<nb_actions>55</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>7</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>20</sum_visit_length>
 		<bounce_count>15</bounce_count>
@@ -19,7 +19,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>35</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>4</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>15</sum_visit_length>
 		<bounce_count>5</bounce_count>
@@ -38,7 +38,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>35</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>4</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>15</sum_visit_length>
 		<bounce_count>5</bounce_count>
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 34db2b4c40..f918428310 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
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>35</nb_visits>
 		<nb_actions>60</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>7</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>25</sum_visit_length>
 		<bounce_count>10</bounce_count>
@@ -19,7 +19,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>30</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>4</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>10</sum_visit_length>
 		<bounce_count>10</bounce_count>
@@ -37,7 +37,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>35</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>4</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>15</sum_visit_length>
 		<bounce_count>5</bounce_count>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserId.getUsers_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserId.getUsers_day.xml
new file mode 100644
index 0000000000..acd3f282fa
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserId.getUsers_day.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>user0</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>5</nb_visits>
+		<nb_actions>5</nb_actions>
+		<nb_users>1</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>5</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		
+	</row>
+	<row>
+		<label>user1</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>5</nb_visits>
+		<nb_actions>5</nb_actions>
+		<nb_users>1</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>5</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		
+	</row>
+	<row>
+		<label>Others</label>
+		<nb_uniq_visitors>13</nb_uniq_visitors>
+		<nb_visits>65</nb_visits>
+		<nb_actions>115</nb_actions>
+		<nb_users>13</nb_users>
+		<max_actions>2</max_actions>
+		<sum_visit_length>50</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__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml
index 7be41dee9b..68bc8eb2bf 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
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
 		<nb_actions>15</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>15</bounce_count>
@@ -18,7 +18,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
 		<nb_actions>30</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>15</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -31,7 +31,7 @@
 		<nb_uniq_visitors>9</nb_uniq_visitors>
 		<nb_visits>45</nb_visits>
 		<nb_actions>80</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>9</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>35</sum_visit_length>
 		<bounce_count>10</bounce_count>
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 a2b38eefe5..d2c4507d0a 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
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>25</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>4</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>5</sum_visit_length>
 		<bounce_count>15</bounce_count>
@@ -18,7 +18,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
 		<nb_actions>30</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>15</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -31,7 +31,7 @@
 		<nb_uniq_visitors>8</nb_uniq_visitors>
 		<nb_visits>40</nb_visits>
 		<nb_actions>70</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>8</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>30</sum_visit_length>
 		<bounce_count>10</bounce_count>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml
index 7c56dfa121..52be85572a 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>4</nb_visits>
 		<nb_actions>4</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>4</bounce_count>
@@ -17,7 +17,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>3</bounce_count>
@@ -29,7 +29,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>2</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -41,7 +41,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>2</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -53,7 +53,7 @@
 		<nb_uniq_visitors>9</nb_uniq_visitors>
 		<nb_visits>9</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>9</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>9</bounce_count>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml
index 10af9e9721..2701dce935 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>3</bounce_count>
@@ -17,7 +17,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>1</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -28,7 +28,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>2</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -41,7 +41,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>2</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -53,7 +53,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>1</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -64,7 +64,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>1</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -77,7 +77,7 @@
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>7</nb_visits>
 		<nb_actions>7</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>7</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>7</bounce_count>
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 77a90f4be6..ec284472ff 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
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>15</nb_uniq_visitors>
 		<nb_visits>55</nb_visits>
 		<nb_actions>105</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>15</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>50</sum_visit_length>
 		<bounce_count>5</bounce_count>
@@ -17,7 +17,7 @@
 		<nb_uniq_visitors>12</nb_uniq_visitors>
 		<nb_visits>12</nb_visits>
 		<nb_actions>12</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>12</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>12</bounce_count>
@@ -29,7 +29,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>2</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -40,7 +40,7 @@
 				<nb_uniq_visitors>3</nb_uniq_visitors>
 				<nb_visits>3</nb_visits>
 				<nb_actions>3</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>3</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>3</bounce_count>
@@ -51,7 +51,7 @@
 				<nb_uniq_visitors>7</nb_uniq_visitors>
 				<nb_visits>7</nb_visits>
 				<nb_actions>7</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>7</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>7</bounce_count>
@@ -64,7 +64,7 @@
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>8</nb_visits>
 		<nb_actions>8</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>7</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>8</bounce_count>
@@ -76,7 +76,7 @@
 				<nb_uniq_visitors>3</nb_uniq_visitors>
 				<nb_visits>4</nb_visits>
 				<nb_actions>4</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>3</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>4</bounce_count>
@@ -87,7 +87,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>2</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -98,7 +98,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>2</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml
index 4e00626c24..d89b5a581d 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>3</bounce_count>
@@ -19,7 +19,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>1</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -30,7 +30,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>2</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -43,7 +43,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>3</bounce_count>
@@ -57,7 +57,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>1</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -68,7 +68,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>2</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -81,7 +81,7 @@
 		<nb_uniq_visitors>6</nb_uniq_visitors>
 		<nb_visits>6</nb_visits>
 		<nb_actions>6</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>6</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>6</bounce_count>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml
index cb46ea8f5f..e0fd222b3f 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>4</nb_visits>
 		<nb_actions>4</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>4</bounce_count>
@@ -17,7 +17,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>1</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -28,7 +28,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>2</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -41,7 +41,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>2</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -53,7 +53,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>1</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -64,7 +64,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>0</nb_users>
+				<nb_users>1</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -77,7 +77,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>2</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
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 ccfbc39c4f..a0d208c1a1 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
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>10</nb_visits>
 		<nb_actions>10</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>2</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>10</bounce_count>
@@ -16,7 +16,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>5</nb_visits>
 		<nb_actions>10</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>1</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>5</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -27,7 +27,7 @@
 		<nb_uniq_visitors>12</nb_uniq_visitors>
 		<nb_visits>60</nb_visits>
 		<nb_actions>105</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>12</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>45</sum_visit_length>
 		<bounce_count>15</bounce_count>
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 65ff214a8d..1e7ffb2bf9 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
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>20</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>4</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
@@ -17,7 +17,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
 		<nb_actions>30</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>3</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>15</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -29,7 +29,7 @@
 		<nb_uniq_visitors>8</nb_uniq_visitors>
 		<nb_visits>40</nb_visits>
 		<nb_actions>75</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>8</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>35</sum_visit_length>
 		<bounce_count>5</bounce_count>
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 428e20c3cc..378a6b593b 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
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>35</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>4</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>15</sum_visit_length>
 		<bounce_count>5</bounce_count>
@@ -23,7 +23,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>35</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>4</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>15</sum_visit_length>
 		<bounce_count>5</bounce_count>
@@ -41,7 +41,7 @@
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>35</nb_visits>
 		<nb_actions>55</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>7</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>20</sum_visit_length>
 		<bounce_count>15</bounce_count>
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 59bacbe3d1..edfaa10ed9 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
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>30</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>4</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>10</sum_visit_length>
 		<bounce_count>10</bounce_count>
@@ -22,7 +22,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>35</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>4</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>15</sum_visit_length>
 		<bounce_count>5</bounce_count>
@@ -39,7 +39,7 @@
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>35</nb_visits>
 		<nb_actions>60</nb_actions>
-		<nb_users>0</nb_users>
+		<nb_users>7</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>25</sum_visit_length>
 		<bounce_count>10</bounce_count>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserId.getUsers_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserId.getUsers_day.xml
new file mode 100644
index 0000000000..acd3f282fa
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserId.getUsers_day.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>user0</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>5</nb_visits>
+		<nb_actions>5</nb_actions>
+		<nb_users>1</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>5</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		
+	</row>
+	<row>
+		<label>user1</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>5</nb_visits>
+		<nb_actions>5</nb_actions>
+		<nb_users>1</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>5</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		
+	</row>
+	<row>
+		<label>Others</label>
+		<nb_uniq_visitors>13</nb_uniq_visitors>
+		<nb_visits>65</nb_visits>
+		<nb_actions>115</nb_actions>
+		<nb_users>13</nb_users>
+		<max_actions>2</max_actions>
+		<sum_visit_length>50</sum_visit_length>
+		<bounce_count>15</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+</result>
\ No newline at end of file