From 579f1e5011566027e40d89f9b79f3b83eb0ded6e Mon Sep 17 00:00:00 2001
From: diosmosis <benaka@piwik.pro>
Date: Fri, 6 Feb 2015 09:51:52 -0800
Subject: [PATCH] Add option to map API tracking parameter to custom variable
 in log importer script. Includes change to ImportLogs system test and fix for
 import log custom variable handling (old behavior was to not set multiple
 custom variables if they were set already instead of simply adding custom
 variables).

---
 misc/log-analytics/import_logs.py             |  79 +++-
 .../Fixtures/ManySitesImportedLogs.php        |  12 +-
 tests/PHPUnit/System/ImportLogsTest.php       |   3 +-
 ...Logs__Actions.getEntryPageTitles_month.xml |  47 ++-
 ...Logs__Actions.getEntryPageTitles_range.xml |  47 ++-
 ...rtLogs__Actions.getEntryPageUrls_month.xml | 303 +++++++------
 ...rtLogs__Actions.getEntryPageUrls_range.xml | 341 ++++++++-------
 ...tLogs__Actions.getExitPageTitles_month.xml |  47 ++-
 ...tLogs__Actions.getExitPageTitles_range.xml |  47 ++-
 ...ortLogs__Actions.getExitPageUrls_month.xml | 359 +++++++++-------
 ...ortLogs__Actions.getExitPageUrls_range.xml | 397 ++++++++++--------
 ...mportLogs__Actions.getPageTitles_month.xml |  63 +--
 ...mportLogs__Actions.getPageTitles_range.xml |  63 +--
 ..._ImportLogs__Actions.getPageUrls_month.xml | 332 ++++++++-------
 ..._ImportLogs__Actions.getPageUrls_range.xml | 370 ++++++++--------
 .../test_ImportLogs__Actions.get_month.xml    |   4 +-
 .../test_ImportLogs__Actions.get_range.xml    |   4 +-
 ...stomVariables.getCustomVariables_month.xml |  93 +++-
 ...ortLogs__DevicePlugins.getPlugin_month.xml |   8 +-
 ...tLogs__DevicesDetection.getBrand_month.xml |  16 +-
 ...vicesDetection.getBrowserEngines_month.xml |  22 +-
 ...icesDetection.getBrowserFamilies_month.xml |  18 +-
 ...icesDetection.getBrowserVersions_month.xml |  40 +-
 ...gs__DevicesDetection.getBrowsers_month.xml |  18 +-
 ...tLogs__DevicesDetection.getModel_month.xml |  16 +-
 ...__DevicesDetection.getOsFamilies_month.xml |  28 +-
 ...__DevicesDetection.getOsVersions_month.xml |  28 +-
 ...rtLogs__DevicesDetection.getType_month.xml |  16 +-
 ...tLogs__Goals.getDaysToConversion_month.xml |   2 +-
 ...__Goals.getVisitsUntilConversion_month.xml |   2 +-
 .../test_ImportLogs__Goals.get_month.xml      |   8 +-
 ...tLogs__Live.getLastVisitsDetails_range.xml | 284 ++++++++++++-
 ...st_ImportLogs__MultiSites.getAll_month.xml |   8 +-
 ...st_ImportLogs__MultiSites.getOne_month.xml |   8 +-
 ...ImportLogs__Provider.getProvider_month.xml |  12 +-
 ...est_ImportLogs__Referrers.getAll_month.xml |   4 +-
 ...tLogs__Referrers.getReferrerType_month.xml |  28 +-
 ...mportLogs__Referrers.getWebsites_month.xml |   8 +-
 ...ogs__Resolution.getConfiguration_month.xml |  26 +-
 ...rtLogs__Resolution.getResolution_month.xml |  12 +-
 ..._ImportLogs__UserCountry.getCity_month.xml |  20 +-
 ...rtLogs__UserCountry.getContinent_month.xml |  22 +-
 ...portLogs__UserCountry.getCountry_month.xml |  22 +-
 ...mportLogs__UserCountry.getRegion_month.xml |  20 +-
 ...ogs__UserSettings.getBrowserType_month.xml |  22 +-
 ...__UserSettings.getBrowserVersion_month.xml |  40 +-
 ...ortLogs__UserSettings.getBrowser_month.xml |  18 +-
 ...s__UserSettings.getConfiguration_month.xml |  26 +-
 ...gs__UserSettings.getLanguageCode_month.xml |  12 +-
 ...rtLogs__UserSettings.getLanguage_month.xml |  12 +-
 ..._UserSettings.getMobileVsDesktop_month.xml |  16 +-
 ...rtLogs__UserSettings.getOSFamily_month.xml |  28 +-
 ...t_ImportLogs__UserSettings.getOS_month.xml |  28 +-
 ...portLogs__UserSettings.getPlugin_month.xml |   8 +-
 ...Logs__UserSettings.getResolution_month.xml |  12 +-
 ...t_ImportLogs__VisitFrequency.get_month.xml |  14 +-
 ...t_ImportLogs__VisitFrequency.get_range.xml |  14 +-
 ...rtLogs__VisitTime.getByDayOfWeek_month.xml |  12 +-
 ....getVisitInformationPerLocalTime_month.xml |  14 +-
 ...getVisitInformationPerServerTime_month.xml |  22 +-
 ...getNumberOfVisitsByDaysSinceLast_month.xml |   4 +-
 ...getNumberOfVisitsByDaysSinceLast_range.xml |   4 +-
 ...st.getNumberOfVisitsByVisitCount_month.xml |   2 +-
 ...st.getNumberOfVisitsByVisitCount_range.xml |   4 +-
 ...nterest.getNumberOfVisitsPerPage_month.xml |   4 +-
 ...nterest.getNumberOfVisitsPerPage_range.xml |   4 +-
 ...etNumberOfVisitsPerVisitDuration_month.xml |   2 +-
 ...etNumberOfVisitsPerVisitDuration_range.xml |   2 +-
 ...rtLogs__VisitsSummary.getActions_month.xml |   2 +-
 ...gs__VisitsSummary.getBounceCount_month.xml |   2 +-
 ...Summary.getSumVisitsLengthPretty_month.xml |   2 +-
 ...VisitsSummary.getSumVisitsLength_month.xml |   2 +-
 ..._VisitsSummary.getUniqueVisitors_month.xml |   2 +-
 ...VisitsSummary.getVisitsConverted_month.xml |   2 +-
 ...ortLogs__VisitsSummary.getVisits_month.xml |   2 +-
 ...st_ImportLogs__VisitsSummary.get_month.xml |  18 +-
 ...ancedAndLast7__MultiSites.getAll_month.xml |  20 +-
 tests/UI/expected-ui-screenshots              |   2 +-
 78 files changed, 2195 insertions(+), 1490 deletions(-)

diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py
index 1ad9654fe8..2e22afa341 100755
--- a/misc/log-analytics/import_logs.py
+++ b/misc/log-analytics/import_logs.py
@@ -36,6 +36,7 @@ import urllib
 import urllib2
 import urlparse
 import subprocess
+import functools
 
 try:
     import json
@@ -580,7 +581,7 @@ class Configuration(object):
             help="By default Piwik tracks as Downloads the most popular file extensions. If you set this parameter (format: pdf,doc,...) then files with an extension found in the list will be imported as Downloads, other file extensions downloads will be skipped."
         )
         option_parser.add_option(
-            '--w3c-map-field', action='callback', callback=self._set_w3c_field_map, type='string',
+            '--w3c-map-field', action='callback', callback=functools.partial(self._set_option_map, 'custom_w3c_fields'), type='string',
             help="Map a custom log entry field in your W3C log to a default one. Use this option to load custom log "
                  "files that use the W3C extended log format such as those from the Advanced Logging W3C module. Used "
                  "as, eg, --w3c-map-field my-date=date. Recognized default fields include: %s\n\n"
@@ -612,20 +613,40 @@ class Configuration(object):
                  "in newer versions of the script in older versions of the script. The output regex can be used with "
                  "the --log-format-regex option."
         )
+        option_parser.add_option(
+            '--api-arg-to-visit-cvar', action='callback', callback=functools.partial(self._set_option_map, 'api_args_to_visit_cvars_map'), type='string',
+            help="Track an attribute through a custom variable with visit scope instead of through Piwik's normal "
+                 "approach. For example, to track usernames as a custom variable instead of through the uid tracking "
+                 "parameter, supply --api-arg-to-visit-cvar=\"uid=User Name\". This will track usernames in a "
+                 "custom variable named 'User Name'."
+        )
+        option_parser.add_option(
+            '--api-arg-to-page-cvar', action='callback', callback=functools.partial(self._set_option_map, 'api_args_to_page_cvars_map'), type='string',
+            help="Track an attribute through a custom variable with page scope instead of through Piwik's normal "
+                 "approach. For example, to track usernames as a custom variable instead of through the uid tracking "
+                 "parameter, supply --api-arg-to-page-cvar=\"uid=User Name\". This will track usernames in a "
+                 "custom variable named 'User Name'."
+        )
         return option_parser
 
-    def _set_w3c_field_map(self, option, opt_str, value, parser):
+    def _set_option_map(self, option_attr_name, option, opt_str, value, parser):
+        """
+        Sets a key-value mapping in a dict that is built from command line options. Options that map
+        string keys to string values (like --w3c-map-field) can set the callback to a bound partial
+        of this method to handle the option.
+        """
+
         parts = value.split('=')
 
         if len(parts) != 2:
-            fatal_error("Invalid --w3c-map-field option: '%s'" % value)
+            fatal_error("Invalid %s option: '%s'" % (opt_str, value))
 
-        custom_name, default_name = parts
+        key, value = parts
 
-        if not hasattr(parser.values, 'custom_w3c_fields'):
-            parser.values.custom_w3c_fields = {}
+        if not hasattr(parser.values, option_attr_name):
+            setattr(parser.values, option_attr_name, {})
 
-        parser.values.custom_w3c_fields[custom_name] = default_name
+        getattr(parser.values, option_attr_name)[key] = value
 
     def _parse_args(self, option_parser):
         """
@@ -686,6 +707,12 @@ class Configuration(object):
                     fatal_error("custom W3C field mapping error: don't know how to parse and use the '%' field" % default_name)
                     return
 
+        if not hasattr(self.options, 'api_args_to_visit_cvars_map'):
+            self.options.api_args_to_visit_cvars_map = {}
+
+        if not hasattr(self.options, 'api_args_to_page_cvars_map'):
+            self.options.api_args_to_page_cvars_map = {}
+
         if not self.options.piwik_url:
             fatal_error('no URL given for Piwik')
 
@@ -1414,13 +1441,13 @@ class Recorder(object):
         if config.options.enable_bots:
             args['bots'] = '1'
             if hit.is_robot:
-                args['_cvar'] = '{"1":["Bot","%s"]}' % hit.user_agent
+                args['_cvar'] = {"1": ["Bot", hit.user_agent]}
             else:
-                args['_cvar'] = '{"1":["Not-Bot","%s"]}' % hit.user_agent
+                args['_cvar'] = {"1": ["Not-Bot", hit.user_agent]}
 
         # do not overwrite custom variables if it's already set (eg. when replaying ecommerce logs)
         if 'cvar' not in args:
-            args['cvar'] = '{"1":["HTTP-code","%s"]}' % hit.status
+            args['cvar'] = {"1": ["HTTP-code", hit.status]}
 
         if hit.is_error or hit.is_redirect:
 			args['action_name'] = '%s%sURL = %s%s' % (
@@ -1446,8 +1473,40 @@ class Recorder(object):
         if hit.length:
             args['bw_bytes'] = hit.length
 
+        if config.options.api_args_to_page_cvars_map:
+            args['cvar'] = self._get_api_args_custom_variables(
+                args.get('cvar', {}), config.options.api_args_to_page_cvars_map, args)
+
+        if config.options.api_args_to_visit_cvars_map:
+            args['_cvar'] = self._get_api_args_custom_variables(
+                args.get('_cvar', {}), config.options.api_args_to_visit_cvars_map, args)
+
+        # convert custom variable args to JSON
+        if 'cvar' in args and not isinstance(args['cvar'], basestring):
+            args['cvar'] = json.dumps(args['cvar'])
+
+        if '_cvar' in args and not isinstance(args['_cvar'], basestring):
+            args['_cvar'] = json.dumps(args['_cvar'])
+
         return args
 
+    def _get_api_args_custom_variables(self, custom_vars, api_args_to_cvars_map, request_args):
+        """
+        Handles the --api-arg-to-...-cvar options by moving API request query parameters to
+        a custom variables data structure. The data structure is returned and can be used in
+        the cvar and _cvar query parameters.
+        """
+        # TODO: test not overwriting existing 'cvars'...
+        for api_arg_name, cvar_key in api_args_to_cvars_map.iteritems():
+            if api_arg_name in request_args:
+                custom_var_num = len(custom_vars) + 1
+                custom_vars[custom_var_num] = [cvar_key, request_args[api_arg_name]]
+
+                del request_args[api_arg_name]
+            else:
+                pass
+        return custom_vars
+
     def _record_hits(self, hits):
         """
         Inserts several hits into Piwik.
diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
index 5dbeb1e85c..853020e2e1 100644
--- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
+++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
@@ -32,6 +32,7 @@ class ManySitesImportedLogs extends Fixture
     public $includeCloudfront = false;
     public $includeCloudfrontRtmp = false;
     public $includeNginxJson = false;
+    public $includeApiCustomVarMapping = false;
 
     public static function createAccessInstance()
     {
@@ -136,6 +137,10 @@ class ManySitesImportedLogs extends Fixture
         if ($this->includeNginxJson) {
             $this->logNginxJsonLog();
         }
+
+        if ($this->includeApiCustomVarMapping) {
+            $this->logIisWithCustomFormat($mapToCustom = true);
+        }
     }
 
     private function setupSegments()
@@ -255,7 +260,7 @@ class ManySitesImportedLogs extends Fixture
         self::executeLogImporter($logFile, $opts);
     }
 
-    private function logIisWithCustomFormat()
+    private function logIisWithCustomFormat($mapToCustom = false)
     {
         $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_custom_iis.log';
 
@@ -265,6 +270,11 @@ class ManySitesImportedLogs extends Fixture
                       '--enable-http-errors'        => false,
                       '--enable-http-redirects'     => false);
 
+        if ($mapToCustom) {
+            $opts['--api-arg-to-visit-cvar'] = 'uid=User Name';
+            $opts['--api-arg-to-page-cvar'] = 'gt_ms=Generation Time';
+        }
+
         self::executeLogImporter($logFile, $opts);
     }
 
diff --git a/tests/PHPUnit/System/ImportLogsTest.php b/tests/PHPUnit/System/ImportLogsTest.php
index f824512e92..fff22849ae 100755
--- a/tests/PHPUnit/System/ImportLogsTest.php
+++ b/tests/PHPUnit/System/ImportLogsTest.php
@@ -113,4 +113,5 @@ ImportLogsTest::$fixture->includeIisWithCustom = true;
 ImportLogsTest::$fixture->includeNetscaler = true;
 ImportLogsTest::$fixture->includeCloudfront = true;
 ImportLogsTest::$fixture->includeCloudfrontRtmp = true;
-ImportLogsTest::$fixture->includeNginxJson = true;
\ No newline at end of file
+ImportLogsTest::$fixture->includeNginxJson = true;
+ImportLogsTest::$fixture->includeApiCustomVarMapping = true;
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml
index b979b765d8..be865a37d7 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml
@@ -2,22 +2,39 @@
 <result>
 	<row>
 		<label>301</label>
-		<nb_visits>2</nb_visits>
-		<nb_hits>2</nb_hits>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
 		<sum_time_spent>180</sum_time_spent>
 		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 		<min_time_generation />
 		<max_time_generation>0</max_time_generation>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
+		<entry_nb_visits>2</entry_nb_visits>
+		<entry_nb_actions>3</entry_nb_actions>
 		<entry_sum_visit_length>182</entry_sum_visit_length>
-		<entry_bounce_count>0</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
-		<avg_time_on_page>90</avg_time_on_page>
-		<bounce_rate>0%</bounce_rate>
-		<exit_rate>50%</exit_rate>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>2</exit_nb_visits>
+		<avg_time_on_page>60</avg_time_on_page>
+		<bounce_rate>50%</bounce_rate>
+		<exit_rate>67%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<subtable>
+			<row>
+				<label> URL = http://piwik.net/Topic/hw43061</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+			</row>
 			<row>
 				<label> URL = http://piwik.net/moved-permanently</label>
 				<nb_visits>1</nb_visits>
@@ -37,8 +54,8 @@
 	</row>
 	<row>
 		<label>404</label>
-		<nb_visits>2</nb_visits>
-		<nb_hits>2</nb_hits>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
 		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 		<min_time_generation>0.359</min_time_generation>
@@ -47,7 +64,7 @@
 		<entry_nb_actions>2</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
 		<entry_bounce_count>2</entry_bounce_count>
-		<exit_nb_visits>2</exit_nb_visits>
+		<exit_nb_visits>3</exit_nb_visits>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
@@ -55,8 +72,8 @@
 		<subtable>
 			<row>
 				<label> URL = http://piwik.net/hello/world/6,681965</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
 				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 				<min_time_generation>0.359</min_time_generation>
@@ -65,7 +82,7 @@
 				<entry_nb_actions>1</entry_nb_actions>
 				<entry_sum_visit_length>0</entry_sum_visit_length>
 				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
+				<exit_nb_visits>2</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml
index 81d66a066b..d830fa0a59 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml
@@ -23,22 +23,39 @@
 	</row>
 	<row>
 		<label>301</label>
-		<nb_visits>2</nb_visits>
-		<nb_hits>2</nb_hits>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
 		<sum_time_spent>180</sum_time_spent>
 		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 		<min_time_generation />
 		<max_time_generation>0</max_time_generation>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
+		<entry_nb_visits>2</entry_nb_visits>
+		<entry_nb_actions>3</entry_nb_actions>
 		<entry_sum_visit_length>182</entry_sum_visit_length>
-		<entry_bounce_count>0</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
-		<avg_time_on_page>90</avg_time_on_page>
-		<bounce_rate>0%</bounce_rate>
-		<exit_rate>50%</exit_rate>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>2</exit_nb_visits>
+		<avg_time_on_page>60</avg_time_on_page>
+		<bounce_rate>50%</bounce_rate>
+		<exit_rate>67%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<subtable>
+			<row>
+				<label> URL = http://piwik.net/Topic/hw43061</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+			</row>
 			<row>
 				<label> URL = http://piwik.net/moved-permanently</label>
 				<nb_visits>1</nb_visits>
@@ -58,8 +75,8 @@
 	</row>
 	<row>
 		<label>404</label>
-		<nb_visits>2</nb_visits>
-		<nb_hits>2</nb_hits>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
 		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 		<min_time_generation>0.359</min_time_generation>
@@ -68,7 +85,7 @@
 		<entry_nb_actions>2</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
 		<entry_bounce_count>2</entry_bounce_count>
-		<exit_nb_visits>2</exit_nb_visits>
+		<exit_nb_visits>3</exit_nb_visits>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
@@ -76,8 +93,8 @@
 		<subtable>
 			<row>
 				<label> URL = http://piwik.net/hello/world/6,681965</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
 				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 				<min_time_generation>0.359</min_time_generation>
@@ -86,7 +103,7 @@
 				<entry_nb_actions>1</entry_nb_actions>
 				<entry_sum_visit_length>0</entry_sum_visit_length>
 				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
+				<exit_nb_visits>2</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
index 1478adad3c..5c3ddd1147 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
@@ -382,6 +382,150 @@
 			</row>
 		</subtable>
 	</row>
+	<row>
+		<label>hello</label>
+		<nb_visits>4</nb_visits>
+		<nb_hits>4</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+		<min_time_generation>0.359</min_time_generation>
+		<max_time_generation>0.359</max_time_generation>
+		<entry_nb_visits>3</entry_nb_visits>
+		<entry_nb_actions>4</entry_nb_actions>
+		<entry_sum_visit_length>2</entry_sum_visit_length>
+		<entry_bounce_count>2</entry_bounce_count>
+		<exit_nb_visits>3</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>67%</bounce_rate>
+		<exit_rate>75%</exit_rate>
+		<avg_time_generation>0.359</avg_time_generation>
+		<subtable>
+			<row>
+				<label>from</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>2</entry_nb_visits>
+				<entry_nb_actions>3</entry_nb_actions>
+				<entry_sum_visit_length>2</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>50%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>another</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>2</entry_nb_visits>
+						<entry_nb_actions>3</entry_nb_actions>
+						<entry_sum_visit_length>2</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>50%</bounce_rate>
+						<exit_rate>50%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<subtable>
+							<row>
+								<label>world</label>
+								<nb_visits>2</nb_visits>
+								<nb_hits>2</nb_hits>
+								<sum_time_spent>0</sum_time_spent>
+								<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+								<min_time_generation>0.359</min_time_generation>
+								<max_time_generation>0.359</max_time_generation>
+								<entry_nb_visits>2</entry_nb_visits>
+								<entry_nb_actions>3</entry_nb_actions>
+								<entry_sum_visit_length>2</entry_sum_visit_length>
+								<entry_bounce_count>1</entry_bounce_count>
+								<exit_nb_visits>1</exit_nb_visits>
+								<avg_time_on_page>0</avg_time_on_page>
+								<bounce_rate>50%</bounce_rate>
+								<exit_rate>50%</exit_rate>
+								<avg_time_generation>0.359</avg_time_generation>
+								<subtable>
+									<row>
+										<label>/6,681965</label>
+										<nb_visits>2</nb_visits>
+										<nb_hits>2</nb_hits>
+										<sum_time_spent>0</sum_time_spent>
+										<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+										<min_time_generation>0.359</min_time_generation>
+										<max_time_generation>0.359</max_time_generation>
+										<entry_nb_visits>2</entry_nb_visits>
+										<entry_nb_actions>3</entry_nb_actions>
+										<entry_sum_visit_length>2</entry_sum_visit_length>
+										<entry_bounce_count>1</entry_bounce_count>
+										<exit_nb_visits>1</exit_nb_visits>
+										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+										<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+										<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+										<avg_time_on_page>0</avg_time_on_page>
+										<bounce_rate>50%</bounce_rate>
+										<exit_rate>50%</exit_rate>
+										<avg_time_generation>0.359</avg_time_generation>
+										<url>http://piwik.net/hello/from/another/world/6,681965</url>
+									</row>
+								</subtable>
+							</row>
+						</subtable>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>world</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>/6,681965</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>1</entry_nb_actions>
+						<entry_sum_visit_length>0</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>2</exit_nb_visits>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>100%</bounce_rate>
+						<exit_rate>100%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<url>http://piwik.net/hello/world/6,681965</url>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
 	<row>
 		<label>/index</label>
 		<nb_visits>3</nb_visits>
@@ -489,146 +633,40 @@
 		</subtable>
 	</row>
 	<row>
-		<label>hello</label>
+		<label>Topic</label>
 		<nb_visits>2</nb_visits>
 		<nb_hits>2</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
-		<min_time_generation>0.359</min_time_generation>
-		<max_time_generation>0.359</max_time_generation>
-		<entry_nb_visits>2</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
-		<entry_sum_visit_length>1</entry_sum_visit_length>
-		<entry_bounce_count>2</entry_bounce_count>
-		<exit_nb_visits>2</exit_nb_visits>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>1</entry_nb_actions>
+		<entry_sum_visit_length>0</entry_sum_visit_length>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
-		<exit_rate>100%</exit_rate>
-		<avg_time_generation>0.359</avg_time_generation>
+		<exit_rate>50%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
-				<label>from</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
-				<sum_time_spent>0</sum_time_spent>
-				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-				<min_time_generation>0.359</min_time_generation>
-				<max_time_generation>0.359</max_time_generation>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>1</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
-				<avg_time_on_page>0</avg_time_on_page>
-				<bounce_rate>100%</bounce_rate>
-				<exit_rate>100%</exit_rate>
-				<avg_time_generation>0.359</avg_time_generation>
-				<subtable>
-					<row>
-						<label>another</label>
-						<nb_visits>1</nb_visits>
-						<nb_hits>1</nb_hits>
-						<sum_time_spent>0</sum_time_spent>
-						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-						<min_time_generation>0.359</min_time_generation>
-						<max_time_generation>0.359</max_time_generation>
-						<entry_nb_visits>1</entry_nb_visits>
-						<entry_nb_actions>1</entry_nb_actions>
-						<entry_sum_visit_length>1</entry_sum_visit_length>
-						<entry_bounce_count>1</entry_bounce_count>
-						<exit_nb_visits>1</exit_nb_visits>
-						<avg_time_on_page>0</avg_time_on_page>
-						<bounce_rate>100%</bounce_rate>
-						<exit_rate>100%</exit_rate>
-						<avg_time_generation>0.359</avg_time_generation>
-						<subtable>
-							<row>
-								<label>world</label>
-								<nb_visits>1</nb_visits>
-								<nb_hits>1</nb_hits>
-								<sum_time_spent>0</sum_time_spent>
-								<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-								<min_time_generation>0.359</min_time_generation>
-								<max_time_generation>0.359</max_time_generation>
-								<entry_nb_visits>1</entry_nb_visits>
-								<entry_nb_actions>1</entry_nb_actions>
-								<entry_sum_visit_length>1</entry_sum_visit_length>
-								<entry_bounce_count>1</entry_bounce_count>
-								<exit_nb_visits>1</exit_nb_visits>
-								<avg_time_on_page>0</avg_time_on_page>
-								<bounce_rate>100%</bounce_rate>
-								<exit_rate>100%</exit_rate>
-								<avg_time_generation>0.359</avg_time_generation>
-								<subtable>
-									<row>
-										<label>/6,681965</label>
-										<nb_visits>1</nb_visits>
-										<nb_hits>1</nb_hits>
-										<sum_time_spent>0</sum_time_spent>
-										<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-										<min_time_generation>0.359</min_time_generation>
-										<max_time_generation>0.359</max_time_generation>
-										<entry_nb_visits>1</entry_nb_visits>
-										<entry_nb_actions>1</entry_nb_actions>
-										<entry_sum_visit_length>1</entry_sum_visit_length>
-										<entry_bounce_count>1</entry_bounce_count>
-										<exit_nb_visits>1</exit_nb_visits>
-										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-										<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-										<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
-										<avg_time_on_page>0</avg_time_on_page>
-										<bounce_rate>100%</bounce_rate>
-										<exit_rate>100%</exit_rate>
-										<avg_time_generation>0.359</avg_time_generation>
-										<url>http://piwik.net/hello/from/another/world/6,681965</url>
-									</row>
-								</subtable>
-							</row>
-						</subtable>
-					</row>
-				</subtable>
-			</row>
-			<row>
-				<label>world</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
+				<label>/hw43061</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-				<min_time_generation>0.359</min_time_generation>
-				<max_time_generation>0.359</max_time_generation>
 				<entry_nb_visits>1</entry_nb_visits>
 				<entry_nb_actions>1</entry_nb_actions>
 				<entry_sum_visit_length>0</entry_sum_visit_length>
 				<entry_bounce_count>1</entry_bounce_count>
 				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>100%</bounce_rate>
-				<exit_rate>100%</exit_rate>
-				<avg_time_generation>0.359</avg_time_generation>
-				<subtable>
-					<row>
-						<label>/6,681965</label>
-						<nb_visits>1</nb_visits>
-						<nb_hits>1</nb_hits>
-						<sum_time_spent>0</sum_time_spent>
-						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-						<min_time_generation>0.359</min_time_generation>
-						<max_time_generation>0.359</max_time_generation>
-						<entry_nb_visits>1</entry_nb_visits>
-						<entry_nb_actions>1</entry_nb_actions>
-						<entry_sum_visit_length>0</entry_sum_visit_length>
-						<entry_bounce_count>1</entry_bounce_count>
-						<exit_nb_visits>1</exit_nb_visits>
-						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
-						<avg_time_on_page>0</avg_time_on_page>
-						<bounce_rate>100%</bounce_rate>
-						<exit_rate>100%</exit_rate>
-						<avg_time_generation>0.359</avg_time_generation>
-						<url>http://piwik.net/hello/world/6,681965</url>
-					</row>
-				</subtable>
+				<exit_rate>50%</exit_rate>
+				<url>http://piwik.net/Topic/hw43061</url>
 			</row>
 		</subtable>
 	</row>
@@ -889,37 +927,40 @@
 	<row>
 		<label>Products</label>
 		<nb_visits>1</nb_visits>
-		<nb_hits>1</nb_hits>
+		<nb_hits>2</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
 		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 		<min_time_generation>0.109</min_time_generation>
 		<max_time_generation>0.109</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
+		<entry_nb_actions>3</entry_nb_actions>
 		<entry_sum_visit_length>2</entry_sum_visit_length>
 		<entry_bounce_count>0</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
-		<exit_rate>0%</exit_rate>
+		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.109</avg_time_generation>
 		<subtable>
 			<row>
 				<label>/theProduct</label>
 				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
+				<nb_hits>2</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
 				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 				<min_time_generation>0.109</min_time_generation>
 				<max_time_generation>0.109</max_time_generation>
 				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>2</entry_nb_actions>
+				<entry_nb_actions>3</entry_nb_actions>
 				<entry_sum_visit_length>2</entry_sum_visit_length>
 				<entry_bounce_count>0</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
-				<exit_rate>0%</exit_rate>
+				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.109</avg_time_generation>
 				<url>http://piwik.net/Products/theProduct</url>
 			</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
index 9cf9c560b7..d89a8b5a90 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
@@ -646,6 +646,150 @@
 			</row>
 		</subtable>
 	</row>
+	<row>
+		<label>hello</label>
+		<nb_visits>4</nb_visits>
+		<nb_hits>4</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+		<min_time_generation>0.359</min_time_generation>
+		<max_time_generation>0.359</max_time_generation>
+		<entry_nb_visits>3</entry_nb_visits>
+		<entry_nb_actions>4</entry_nb_actions>
+		<entry_sum_visit_length>2</entry_sum_visit_length>
+		<entry_bounce_count>2</entry_bounce_count>
+		<exit_nb_visits>3</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>67%</bounce_rate>
+		<exit_rate>75%</exit_rate>
+		<avg_time_generation>0.359</avg_time_generation>
+		<subtable>
+			<row>
+				<label>from</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>2</entry_nb_visits>
+				<entry_nb_actions>3</entry_nb_actions>
+				<entry_sum_visit_length>2</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>50%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>another</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>2</entry_nb_visits>
+						<entry_nb_actions>3</entry_nb_actions>
+						<entry_sum_visit_length>2</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>50%</bounce_rate>
+						<exit_rate>50%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<subtable>
+							<row>
+								<label>world</label>
+								<nb_visits>2</nb_visits>
+								<nb_hits>2</nb_hits>
+								<sum_time_spent>0</sum_time_spent>
+								<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+								<min_time_generation>0.359</min_time_generation>
+								<max_time_generation>0.359</max_time_generation>
+								<entry_nb_visits>2</entry_nb_visits>
+								<entry_nb_actions>3</entry_nb_actions>
+								<entry_sum_visit_length>2</entry_sum_visit_length>
+								<entry_bounce_count>1</entry_bounce_count>
+								<exit_nb_visits>1</exit_nb_visits>
+								<avg_time_on_page>0</avg_time_on_page>
+								<bounce_rate>50%</bounce_rate>
+								<exit_rate>50%</exit_rate>
+								<avg_time_generation>0.359</avg_time_generation>
+								<subtable>
+									<row>
+										<label>/6,681965</label>
+										<nb_visits>2</nb_visits>
+										<nb_hits>2</nb_hits>
+										<sum_time_spent>0</sum_time_spent>
+										<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+										<min_time_generation>0.359</min_time_generation>
+										<max_time_generation>0.359</max_time_generation>
+										<entry_nb_visits>2</entry_nb_visits>
+										<entry_nb_actions>3</entry_nb_actions>
+										<entry_sum_visit_length>2</entry_sum_visit_length>
+										<entry_bounce_count>1</entry_bounce_count>
+										<exit_nb_visits>1</exit_nb_visits>
+										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+										<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+										<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+										<avg_time_on_page>0</avg_time_on_page>
+										<bounce_rate>50%</bounce_rate>
+										<exit_rate>50%</exit_rate>
+										<avg_time_generation>0.359</avg_time_generation>
+										<url>http://piwik.net/hello/from/another/world/6,681965</url>
+									</row>
+								</subtable>
+							</row>
+						</subtable>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>world</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>/6,681965</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>1</entry_nb_actions>
+						<entry_sum_visit_length>0</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>2</exit_nb_visits>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>100%</bounce_rate>
+						<exit_rate>100%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<url>http://piwik.net/hello/world/6,681965</url>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
 	<row>
 		<label>Citrix</label>
 		<nb_visits>2</nb_visits>
@@ -784,150 +928,6 @@
 			</row>
 		</subtable>
 	</row>
-	<row>
-		<label>hello</label>
-		<nb_visits>2</nb_visits>
-		<nb_hits>2</nb_hits>
-		<sum_time_spent>0</sum_time_spent>
-		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
-		<min_time_generation>0.359</min_time_generation>
-		<max_time_generation>0.359</max_time_generation>
-		<entry_nb_visits>2</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
-		<entry_sum_visit_length>1</entry_sum_visit_length>
-		<entry_bounce_count>2</entry_bounce_count>
-		<exit_nb_visits>2</exit_nb_visits>
-		<avg_time_on_page>0</avg_time_on_page>
-		<bounce_rate>100%</bounce_rate>
-		<exit_rate>100%</exit_rate>
-		<avg_time_generation>0.359</avg_time_generation>
-		<subtable>
-			<row>
-				<label>from</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
-				<sum_time_spent>0</sum_time_spent>
-				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-				<min_time_generation>0.359</min_time_generation>
-				<max_time_generation>0.359</max_time_generation>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>1</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
-				<avg_time_on_page>0</avg_time_on_page>
-				<bounce_rate>100%</bounce_rate>
-				<exit_rate>100%</exit_rate>
-				<avg_time_generation>0.359</avg_time_generation>
-				<subtable>
-					<row>
-						<label>another</label>
-						<nb_visits>1</nb_visits>
-						<nb_hits>1</nb_hits>
-						<sum_time_spent>0</sum_time_spent>
-						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-						<min_time_generation>0.359</min_time_generation>
-						<max_time_generation>0.359</max_time_generation>
-						<entry_nb_visits>1</entry_nb_visits>
-						<entry_nb_actions>1</entry_nb_actions>
-						<entry_sum_visit_length>1</entry_sum_visit_length>
-						<entry_bounce_count>1</entry_bounce_count>
-						<exit_nb_visits>1</exit_nb_visits>
-						<avg_time_on_page>0</avg_time_on_page>
-						<bounce_rate>100%</bounce_rate>
-						<exit_rate>100%</exit_rate>
-						<avg_time_generation>0.359</avg_time_generation>
-						<subtable>
-							<row>
-								<label>world</label>
-								<nb_visits>1</nb_visits>
-								<nb_hits>1</nb_hits>
-								<sum_time_spent>0</sum_time_spent>
-								<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-								<min_time_generation>0.359</min_time_generation>
-								<max_time_generation>0.359</max_time_generation>
-								<entry_nb_visits>1</entry_nb_visits>
-								<entry_nb_actions>1</entry_nb_actions>
-								<entry_sum_visit_length>1</entry_sum_visit_length>
-								<entry_bounce_count>1</entry_bounce_count>
-								<exit_nb_visits>1</exit_nb_visits>
-								<avg_time_on_page>0</avg_time_on_page>
-								<bounce_rate>100%</bounce_rate>
-								<exit_rate>100%</exit_rate>
-								<avg_time_generation>0.359</avg_time_generation>
-								<subtable>
-									<row>
-										<label>/6,681965</label>
-										<nb_visits>1</nb_visits>
-										<nb_hits>1</nb_hits>
-										<sum_time_spent>0</sum_time_spent>
-										<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-										<min_time_generation>0.359</min_time_generation>
-										<max_time_generation>0.359</max_time_generation>
-										<entry_nb_visits>1</entry_nb_visits>
-										<entry_nb_actions>1</entry_nb_actions>
-										<entry_sum_visit_length>1</entry_sum_visit_length>
-										<entry_bounce_count>1</entry_bounce_count>
-										<exit_nb_visits>1</exit_nb_visits>
-										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-										<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-										<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
-										<avg_time_on_page>0</avg_time_on_page>
-										<bounce_rate>100%</bounce_rate>
-										<exit_rate>100%</exit_rate>
-										<avg_time_generation>0.359</avg_time_generation>
-										<url>http://piwik.net/hello/from/another/world/6,681965</url>
-									</row>
-								</subtable>
-							</row>
-						</subtable>
-					</row>
-				</subtable>
-			</row>
-			<row>
-				<label>world</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
-				<sum_time_spent>0</sum_time_spent>
-				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-				<min_time_generation>0.359</min_time_generation>
-				<max_time_generation>0.359</max_time_generation>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
-				<avg_time_on_page>0</avg_time_on_page>
-				<bounce_rate>100%</bounce_rate>
-				<exit_rate>100%</exit_rate>
-				<avg_time_generation>0.359</avg_time_generation>
-				<subtable>
-					<row>
-						<label>/6,681965</label>
-						<nb_visits>1</nb_visits>
-						<nb_hits>1</nb_hits>
-						<sum_time_spent>0</sum_time_spent>
-						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-						<min_time_generation>0.359</min_time_generation>
-						<max_time_generation>0.359</max_time_generation>
-						<entry_nb_visits>1</entry_nb_visits>
-						<entry_nb_actions>1</entry_nb_actions>
-						<entry_sum_visit_length>0</entry_sum_visit_length>
-						<entry_bounce_count>1</entry_bounce_count>
-						<exit_nb_visits>1</exit_nb_visits>
-						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
-						<avg_time_on_page>0</avg_time_on_page>
-						<bounce_rate>100%</bounce_rate>
-						<exit_rate>100%</exit_rate>
-						<avg_time_generation>0.359</avg_time_generation>
-						<url>http://piwik.net/hello/world/6,681965</url>
-					</row>
-				</subtable>
-			</row>
-		</subtable>
-	</row>
 	<row>
 		<label>log-analytics</label>
 		<nb_visits>2</nb_visits>
@@ -970,6 +970,44 @@
 			</row>
 		</subtable>
 	</row>
+	<row>
+		<label>Topic</label>
+		<nb_visits>2</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>1</entry_nb_actions>
+		<entry_sum_visit_length>0</entry_sum_visit_length>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>100%</bounce_rate>
+		<exit_rate>50%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/hw43061</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<url>http://piwik.net/Topic/hw43061</url>
+			</row>
+		</subtable>
+	</row>
 	<row>
 		<label>/index.htm</label>
 		<nb_visits>1</nb_visits>
@@ -1230,37 +1268,40 @@
 	<row>
 		<label>Products</label>
 		<nb_visits>1</nb_visits>
-		<nb_hits>1</nb_hits>
+		<nb_hits>2</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
 		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 		<min_time_generation>0.109</min_time_generation>
 		<max_time_generation>0.109</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
+		<entry_nb_actions>3</entry_nb_actions>
 		<entry_sum_visit_length>2</entry_sum_visit_length>
 		<entry_bounce_count>0</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
-		<exit_rate>0%</exit_rate>
+		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.109</avg_time_generation>
 		<subtable>
 			<row>
 				<label>/theProduct</label>
 				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
+				<nb_hits>2</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
 				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 				<min_time_generation>0.109</min_time_generation>
 				<max_time_generation>0.109</max_time_generation>
 				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>2</entry_nb_actions>
+				<entry_nb_actions>3</entry_nb_actions>
 				<entry_sum_visit_length>2</entry_sum_visit_length>
 				<entry_bounce_count>0</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
-				<exit_rate>0%</exit_rate>
+				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.109</avg_time_generation>
 				<url>http://piwik.net/Products/theProduct</url>
 			</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml
index 8789133564..4e75cfd774 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml
@@ -2,40 +2,45 @@
 <result>
 	<row>
 		<label>301</label>
-		<nb_visits>2</nb_visits>
-		<nb_hits>2</nb_hits>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
 		<sum_time_spent>180</sum_time_spent>
 		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 		<min_time_generation />
 		<max_time_generation>0</max_time_generation>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
+		<entry_nb_visits>2</entry_nb_visits>
+		<entry_nb_actions>3</entry_nb_actions>
 		<entry_sum_visit_length>182</entry_sum_visit_length>
-		<entry_bounce_count>0</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
-		<avg_time_on_page>90</avg_time_on_page>
-		<bounce_rate>0%</bounce_rate>
-		<exit_rate>50%</exit_rate>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>2</exit_nb_visits>
+		<avg_time_on_page>60</avg_time_on_page>
+		<bounce_rate>50%</bounce_rate>
+		<exit_rate>67%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label> URL = http://piwik.net/Topic/hw43061</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<exit_nb_visits>1</exit_nb_visits>
-				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>0</avg_time_on_page>
-				<bounce_rate>0%</bounce_rate>
+				<bounce_rate>100%</bounce_rate>
 				<exit_rate>100%</exit_rate>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>404</label>
-		<nb_visits>2</nb_visits>
-		<nb_hits>2</nb_hits>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
 		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 		<min_time_generation>0.359</min_time_generation>
@@ -44,7 +49,7 @@
 		<entry_nb_actions>2</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
 		<entry_bounce_count>2</entry_bounce_count>
-		<exit_nb_visits>2</exit_nb_visits>
+		<exit_nb_visits>3</exit_nb_visits>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
@@ -52,8 +57,8 @@
 		<subtable>
 			<row>
 				<label> URL = http://piwik.net/hello/world/6,681965</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
 				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 				<min_time_generation>0.359</min_time_generation>
@@ -62,7 +67,7 @@
 				<entry_nb_actions>1</entry_nb_actions>
 				<entry_sum_visit_length>0</entry_sum_visit_length>
 				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
+				<exit_nb_visits>2</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml
index 401a36b835..0cdf2e7047 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml
@@ -23,40 +23,45 @@
 	</row>
 	<row>
 		<label>301</label>
-		<nb_visits>2</nb_visits>
-		<nb_hits>2</nb_hits>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
 		<sum_time_spent>180</sum_time_spent>
 		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 		<min_time_generation />
 		<max_time_generation>0</max_time_generation>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
+		<entry_nb_visits>2</entry_nb_visits>
+		<entry_nb_actions>3</entry_nb_actions>
 		<entry_sum_visit_length>182</entry_sum_visit_length>
-		<entry_bounce_count>0</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
-		<avg_time_on_page>90</avg_time_on_page>
-		<bounce_rate>0%</bounce_rate>
-		<exit_rate>50%</exit_rate>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>2</exit_nb_visits>
+		<avg_time_on_page>60</avg_time_on_page>
+		<bounce_rate>50%</bounce_rate>
+		<exit_rate>67%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label> URL = http://piwik.net/Topic/hw43061</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<exit_nb_visits>1</exit_nb_visits>
-				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>0</avg_time_on_page>
-				<bounce_rate>0%</bounce_rate>
+				<bounce_rate>100%</bounce_rate>
 				<exit_rate>100%</exit_rate>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>404</label>
-		<nb_visits>2</nb_visits>
-		<nb_hits>2</nb_hits>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
 		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 		<min_time_generation>0.359</min_time_generation>
@@ -65,7 +70,7 @@
 		<entry_nb_actions>2</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
 		<entry_bounce_count>2</entry_bounce_count>
-		<exit_nb_visits>2</exit_nb_visits>
+		<exit_nb_visits>3</exit_nb_visits>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
@@ -73,8 +78,8 @@
 		<subtable>
 			<row>
 				<label> URL = http://piwik.net/hello/world/6,681965</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
 				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 				<min_time_generation>0.359</min_time_generation>
@@ -83,7 +88,7 @@
 				<entry_nb_actions>1</entry_nb_actions>
 				<entry_sum_visit_length>0</entry_sum_visit_length>
 				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
+				<exit_nb_visits>2</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
index 1522a10280..0b291ef113 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
@@ -382,6 +382,150 @@
 			</row>
 		</subtable>
 	</row>
+	<row>
+		<label>hello</label>
+		<nb_visits>4</nb_visits>
+		<nb_hits>4</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+		<min_time_generation>0.359</min_time_generation>
+		<max_time_generation>0.359</max_time_generation>
+		<entry_nb_visits>3</entry_nb_visits>
+		<entry_nb_actions>4</entry_nb_actions>
+		<entry_sum_visit_length>2</entry_sum_visit_length>
+		<entry_bounce_count>2</entry_bounce_count>
+		<exit_nb_visits>3</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>67%</bounce_rate>
+		<exit_rate>75%</exit_rate>
+		<avg_time_generation>0.359</avg_time_generation>
+		<subtable>
+			<row>
+				<label>from</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>2</entry_nb_visits>
+				<entry_nb_actions>3</entry_nb_actions>
+				<entry_sum_visit_length>2</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>50%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>another</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>2</entry_nb_visits>
+						<entry_nb_actions>3</entry_nb_actions>
+						<entry_sum_visit_length>2</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>50%</bounce_rate>
+						<exit_rate>50%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<subtable>
+							<row>
+								<label>world</label>
+								<nb_visits>2</nb_visits>
+								<nb_hits>2</nb_hits>
+								<sum_time_spent>0</sum_time_spent>
+								<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+								<min_time_generation>0.359</min_time_generation>
+								<max_time_generation>0.359</max_time_generation>
+								<entry_nb_visits>2</entry_nb_visits>
+								<entry_nb_actions>3</entry_nb_actions>
+								<entry_sum_visit_length>2</entry_sum_visit_length>
+								<entry_bounce_count>1</entry_bounce_count>
+								<exit_nb_visits>1</exit_nb_visits>
+								<avg_time_on_page>0</avg_time_on_page>
+								<bounce_rate>50%</bounce_rate>
+								<exit_rate>50%</exit_rate>
+								<avg_time_generation>0.359</avg_time_generation>
+								<subtable>
+									<row>
+										<label>/6,681965</label>
+										<nb_visits>2</nb_visits>
+										<nb_hits>2</nb_hits>
+										<sum_time_spent>0</sum_time_spent>
+										<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+										<min_time_generation>0.359</min_time_generation>
+										<max_time_generation>0.359</max_time_generation>
+										<entry_nb_visits>2</entry_nb_visits>
+										<entry_nb_actions>3</entry_nb_actions>
+										<entry_sum_visit_length>2</entry_sum_visit_length>
+										<entry_bounce_count>1</entry_bounce_count>
+										<exit_nb_visits>1</exit_nb_visits>
+										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+										<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+										<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+										<avg_time_on_page>0</avg_time_on_page>
+										<bounce_rate>50%</bounce_rate>
+										<exit_rate>50%</exit_rate>
+										<avg_time_generation>0.359</avg_time_generation>
+										<url>http://piwik.net/hello/from/another/world/6,681965</url>
+									</row>
+								</subtable>
+							</row>
+						</subtable>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>world</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>/6,681965</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>1</entry_nb_actions>
+						<entry_sum_visit_length>0</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>2</exit_nb_visits>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>100%</bounce_rate>
+						<exit_rate>100%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<url>http://piwik.net/hello/world/6,681965</url>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
 	<row>
 		<label>/index</label>
 		<nb_visits>3</nb_visits>
@@ -486,146 +630,40 @@
 		</subtable>
 	</row>
 	<row>
-		<label>hello</label>
+		<label>Topic</label>
 		<nb_visits>2</nb_visits>
 		<nb_hits>2</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
-		<min_time_generation>0.359</min_time_generation>
-		<max_time_generation>0.359</max_time_generation>
-		<entry_nb_visits>2</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
-		<entry_sum_visit_length>1</entry_sum_visit_length>
-		<entry_bounce_count>2</entry_bounce_count>
-		<exit_nb_visits>2</exit_nb_visits>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>1</entry_nb_actions>
+		<entry_sum_visit_length>0</entry_sum_visit_length>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
-		<exit_rate>100%</exit_rate>
-		<avg_time_generation>0.359</avg_time_generation>
+		<exit_rate>50%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
-				<label>from</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
-				<sum_time_spent>0</sum_time_spent>
-				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-				<min_time_generation>0.359</min_time_generation>
-				<max_time_generation>0.359</max_time_generation>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>1</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
-				<avg_time_on_page>0</avg_time_on_page>
-				<bounce_rate>100%</bounce_rate>
-				<exit_rate>100%</exit_rate>
-				<avg_time_generation>0.359</avg_time_generation>
-				<subtable>
-					<row>
-						<label>another</label>
-						<nb_visits>1</nb_visits>
-						<nb_hits>1</nb_hits>
-						<sum_time_spent>0</sum_time_spent>
-						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-						<min_time_generation>0.359</min_time_generation>
-						<max_time_generation>0.359</max_time_generation>
-						<entry_nb_visits>1</entry_nb_visits>
-						<entry_nb_actions>1</entry_nb_actions>
-						<entry_sum_visit_length>1</entry_sum_visit_length>
-						<entry_bounce_count>1</entry_bounce_count>
-						<exit_nb_visits>1</exit_nb_visits>
-						<avg_time_on_page>0</avg_time_on_page>
-						<bounce_rate>100%</bounce_rate>
-						<exit_rate>100%</exit_rate>
-						<avg_time_generation>0.359</avg_time_generation>
-						<subtable>
-							<row>
-								<label>world</label>
-								<nb_visits>1</nb_visits>
-								<nb_hits>1</nb_hits>
-								<sum_time_spent>0</sum_time_spent>
-								<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-								<min_time_generation>0.359</min_time_generation>
-								<max_time_generation>0.359</max_time_generation>
-								<entry_nb_visits>1</entry_nb_visits>
-								<entry_nb_actions>1</entry_nb_actions>
-								<entry_sum_visit_length>1</entry_sum_visit_length>
-								<entry_bounce_count>1</entry_bounce_count>
-								<exit_nb_visits>1</exit_nb_visits>
-								<avg_time_on_page>0</avg_time_on_page>
-								<bounce_rate>100%</bounce_rate>
-								<exit_rate>100%</exit_rate>
-								<avg_time_generation>0.359</avg_time_generation>
-								<subtable>
-									<row>
-										<label>/6,681965</label>
-										<nb_visits>1</nb_visits>
-										<nb_hits>1</nb_hits>
-										<sum_time_spent>0</sum_time_spent>
-										<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-										<min_time_generation>0.359</min_time_generation>
-										<max_time_generation>0.359</max_time_generation>
-										<entry_nb_visits>1</entry_nb_visits>
-										<entry_nb_actions>1</entry_nb_actions>
-										<entry_sum_visit_length>1</entry_sum_visit_length>
-										<entry_bounce_count>1</entry_bounce_count>
-										<exit_nb_visits>1</exit_nb_visits>
-										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-										<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-										<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
-										<avg_time_on_page>0</avg_time_on_page>
-										<bounce_rate>100%</bounce_rate>
-										<exit_rate>100%</exit_rate>
-										<avg_time_generation>0.359</avg_time_generation>
-										<url>http://piwik.net/hello/from/another/world/6,681965</url>
-									</row>
-								</subtable>
-							</row>
-						</subtable>
-					</row>
-				</subtable>
-			</row>
-			<row>
-				<label>world</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
+				<label>/hw43061</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-				<min_time_generation>0.359</min_time_generation>
-				<max_time_generation>0.359</max_time_generation>
 				<entry_nb_visits>1</entry_nb_visits>
 				<entry_nb_actions>1</entry_nb_actions>
 				<entry_sum_visit_length>0</entry_sum_visit_length>
 				<entry_bounce_count>1</entry_bounce_count>
 				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>100%</bounce_rate>
-				<exit_rate>100%</exit_rate>
-				<avg_time_generation>0.359</avg_time_generation>
-				<subtable>
-					<row>
-						<label>/6,681965</label>
-						<nb_visits>1</nb_visits>
-						<nb_hits>1</nb_hits>
-						<sum_time_spent>0</sum_time_spent>
-						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-						<min_time_generation>0.359</min_time_generation>
-						<max_time_generation>0.359</max_time_generation>
-						<entry_nb_visits>1</entry_nb_visits>
-						<entry_nb_actions>1</entry_nb_actions>
-						<entry_sum_visit_length>0</entry_sum_visit_length>
-						<entry_bounce_count>1</entry_bounce_count>
-						<exit_nb_visits>1</exit_nb_visits>
-						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
-						<avg_time_on_page>0</avg_time_on_page>
-						<bounce_rate>100%</bounce_rate>
-						<exit_rate>100%</exit_rate>
-						<avg_time_generation>0.359</avg_time_generation>
-						<url>http://piwik.net/hello/world/6,681965</url>
-					</row>
-				</subtable>
+				<exit_rate>50%</exit_rate>
+				<url>http://piwik.net/Topic/hw43061</url>
 			</row>
 		</subtable>
 	</row>
@@ -880,6 +918,48 @@
 			</row>
 		</subtable>
 	</row>
+	<row>
+		<label>Products</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+		<min_time_generation>0.109</min_time_generation>
+		<max_time_generation>0.109</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>3</entry_nb_actions>
+		<entry_sum_visit_length>2</entry_sum_visit_length>
+		<entry_bounce_count>0</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.109</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/theProduct</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+				<min_time_generation>0.109</min_time_generation>
+				<max_time_generation>0.109</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>3</entry_nb_actions>
+				<entry_sum_visit_length>2</entry_sum_visit_length>
+				<entry_bounce_count>0</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.109</avg_time_generation>
+				<url>http://piwik.net/Products/theProduct</url>
+			</row>
+		</subtable>
+	</row>
 	<row>
 		<label>this</label>
 		<nb_visits>1</nb_visits>
@@ -1046,35 +1126,6 @@
 			</row>
 		</subtable>
 	</row>
-	<row>
-		<label>Topic</label>
-		<nb_visits>1</nb_visits>
-		<nb_hits>1</nb_hits>
-		<sum_time_spent>0</sum_time_spent>
-		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-		<min_time_generation />
-		<max_time_generation>0</max_time_generation>
-		<exit_nb_visits>1</exit_nb_visits>
-		<avg_time_on_page>0</avg_time_on_page>
-		<bounce_rate>0%</bounce_rate>
-		<exit_rate>100%</exit_rate>
-		<avg_time_generation>0</avg_time_generation>
-		<subtable>
-			<row>
-				<label>/hw43061</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
-				<sum_time_spent>0</sum_time_spent>
-				<exit_nb_visits>1</exit_nb_visits>
-				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
-				<avg_time_on_page>0</avg_time_on_page>
-				<bounce_rate>0%</bounce_rate>
-				<exit_rate>100%</exit_rate>
-				<url>http://piwik.net/Topic/hw43061</url>
-			</row>
-		</subtable>
-	</row>
 	<row>
 		<label>translations</label>
 		<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
index 2eebd3928d..484a6525e7 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
@@ -646,6 +646,150 @@
 			</row>
 		</subtable>
 	</row>
+	<row>
+		<label>hello</label>
+		<nb_visits>4</nb_visits>
+		<nb_hits>4</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+		<min_time_generation>0.359</min_time_generation>
+		<max_time_generation>0.359</max_time_generation>
+		<entry_nb_visits>3</entry_nb_visits>
+		<entry_nb_actions>4</entry_nb_actions>
+		<entry_sum_visit_length>2</entry_sum_visit_length>
+		<entry_bounce_count>2</entry_bounce_count>
+		<exit_nb_visits>3</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>67%</bounce_rate>
+		<exit_rate>75%</exit_rate>
+		<avg_time_generation>0.359</avg_time_generation>
+		<subtable>
+			<row>
+				<label>from</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>2</entry_nb_visits>
+				<entry_nb_actions>3</entry_nb_actions>
+				<entry_sum_visit_length>2</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>50%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>another</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>2</entry_nb_visits>
+						<entry_nb_actions>3</entry_nb_actions>
+						<entry_sum_visit_length>2</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>50%</bounce_rate>
+						<exit_rate>50%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<subtable>
+							<row>
+								<label>world</label>
+								<nb_visits>2</nb_visits>
+								<nb_hits>2</nb_hits>
+								<sum_time_spent>0</sum_time_spent>
+								<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+								<min_time_generation>0.359</min_time_generation>
+								<max_time_generation>0.359</max_time_generation>
+								<entry_nb_visits>2</entry_nb_visits>
+								<entry_nb_actions>3</entry_nb_actions>
+								<entry_sum_visit_length>2</entry_sum_visit_length>
+								<entry_bounce_count>1</entry_bounce_count>
+								<exit_nb_visits>1</exit_nb_visits>
+								<avg_time_on_page>0</avg_time_on_page>
+								<bounce_rate>50%</bounce_rate>
+								<exit_rate>50%</exit_rate>
+								<avg_time_generation>0.359</avg_time_generation>
+								<subtable>
+									<row>
+										<label>/6,681965</label>
+										<nb_visits>2</nb_visits>
+										<nb_hits>2</nb_hits>
+										<sum_time_spent>0</sum_time_spent>
+										<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+										<min_time_generation>0.359</min_time_generation>
+										<max_time_generation>0.359</max_time_generation>
+										<entry_nb_visits>2</entry_nb_visits>
+										<entry_nb_actions>3</entry_nb_actions>
+										<entry_sum_visit_length>2</entry_sum_visit_length>
+										<entry_bounce_count>1</entry_bounce_count>
+										<exit_nb_visits>1</exit_nb_visits>
+										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+										<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+										<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+										<avg_time_on_page>0</avg_time_on_page>
+										<bounce_rate>50%</bounce_rate>
+										<exit_rate>50%</exit_rate>
+										<avg_time_generation>0.359</avg_time_generation>
+										<url>http://piwik.net/hello/from/another/world/6,681965</url>
+									</row>
+								</subtable>
+							</row>
+						</subtable>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>world</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>/6,681965</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>1</entry_nb_actions>
+						<entry_sum_visit_length>0</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>2</exit_nb_visits>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>100%</bounce_rate>
+						<exit_rate>100%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<url>http://piwik.net/hello/world/6,681965</url>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
 	<row>
 		<label>Citrix</label>
 		<nb_visits>2</nb_visits>
@@ -781,150 +925,6 @@
 			</row>
 		</subtable>
 	</row>
-	<row>
-		<label>hello</label>
-		<nb_visits>2</nb_visits>
-		<nb_hits>2</nb_hits>
-		<sum_time_spent>0</sum_time_spent>
-		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
-		<min_time_generation>0.359</min_time_generation>
-		<max_time_generation>0.359</max_time_generation>
-		<entry_nb_visits>2</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
-		<entry_sum_visit_length>1</entry_sum_visit_length>
-		<entry_bounce_count>2</entry_bounce_count>
-		<exit_nb_visits>2</exit_nb_visits>
-		<avg_time_on_page>0</avg_time_on_page>
-		<bounce_rate>100%</bounce_rate>
-		<exit_rate>100%</exit_rate>
-		<avg_time_generation>0.359</avg_time_generation>
-		<subtable>
-			<row>
-				<label>from</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
-				<sum_time_spent>0</sum_time_spent>
-				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-				<min_time_generation>0.359</min_time_generation>
-				<max_time_generation>0.359</max_time_generation>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>1</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
-				<avg_time_on_page>0</avg_time_on_page>
-				<bounce_rate>100%</bounce_rate>
-				<exit_rate>100%</exit_rate>
-				<avg_time_generation>0.359</avg_time_generation>
-				<subtable>
-					<row>
-						<label>another</label>
-						<nb_visits>1</nb_visits>
-						<nb_hits>1</nb_hits>
-						<sum_time_spent>0</sum_time_spent>
-						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-						<min_time_generation>0.359</min_time_generation>
-						<max_time_generation>0.359</max_time_generation>
-						<entry_nb_visits>1</entry_nb_visits>
-						<entry_nb_actions>1</entry_nb_actions>
-						<entry_sum_visit_length>1</entry_sum_visit_length>
-						<entry_bounce_count>1</entry_bounce_count>
-						<exit_nb_visits>1</exit_nb_visits>
-						<avg_time_on_page>0</avg_time_on_page>
-						<bounce_rate>100%</bounce_rate>
-						<exit_rate>100%</exit_rate>
-						<avg_time_generation>0.359</avg_time_generation>
-						<subtable>
-							<row>
-								<label>world</label>
-								<nb_visits>1</nb_visits>
-								<nb_hits>1</nb_hits>
-								<sum_time_spent>0</sum_time_spent>
-								<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-								<min_time_generation>0.359</min_time_generation>
-								<max_time_generation>0.359</max_time_generation>
-								<entry_nb_visits>1</entry_nb_visits>
-								<entry_nb_actions>1</entry_nb_actions>
-								<entry_sum_visit_length>1</entry_sum_visit_length>
-								<entry_bounce_count>1</entry_bounce_count>
-								<exit_nb_visits>1</exit_nb_visits>
-								<avg_time_on_page>0</avg_time_on_page>
-								<bounce_rate>100%</bounce_rate>
-								<exit_rate>100%</exit_rate>
-								<avg_time_generation>0.359</avg_time_generation>
-								<subtable>
-									<row>
-										<label>/6,681965</label>
-										<nb_visits>1</nb_visits>
-										<nb_hits>1</nb_hits>
-										<sum_time_spent>0</sum_time_spent>
-										<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-										<min_time_generation>0.359</min_time_generation>
-										<max_time_generation>0.359</max_time_generation>
-										<entry_nb_visits>1</entry_nb_visits>
-										<entry_nb_actions>1</entry_nb_actions>
-										<entry_sum_visit_length>1</entry_sum_visit_length>
-										<entry_bounce_count>1</entry_bounce_count>
-										<exit_nb_visits>1</exit_nb_visits>
-										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-										<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-										<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
-										<avg_time_on_page>0</avg_time_on_page>
-										<bounce_rate>100%</bounce_rate>
-										<exit_rate>100%</exit_rate>
-										<avg_time_generation>0.359</avg_time_generation>
-										<url>http://piwik.net/hello/from/another/world/6,681965</url>
-									</row>
-								</subtable>
-							</row>
-						</subtable>
-					</row>
-				</subtable>
-			</row>
-			<row>
-				<label>world</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
-				<sum_time_spent>0</sum_time_spent>
-				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-				<min_time_generation>0.359</min_time_generation>
-				<max_time_generation>0.359</max_time_generation>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
-				<avg_time_on_page>0</avg_time_on_page>
-				<bounce_rate>100%</bounce_rate>
-				<exit_rate>100%</exit_rate>
-				<avg_time_generation>0.359</avg_time_generation>
-				<subtable>
-					<row>
-						<label>/6,681965</label>
-						<nb_visits>1</nb_visits>
-						<nb_hits>1</nb_hits>
-						<sum_time_spent>0</sum_time_spent>
-						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-						<min_time_generation>0.359</min_time_generation>
-						<max_time_generation>0.359</max_time_generation>
-						<entry_nb_visits>1</entry_nb_visits>
-						<entry_nb_actions>1</entry_nb_actions>
-						<entry_sum_visit_length>0</entry_sum_visit_length>
-						<entry_bounce_count>1</entry_bounce_count>
-						<exit_nb_visits>1</exit_nb_visits>
-						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
-						<avg_time_on_page>0</avg_time_on_page>
-						<bounce_rate>100%</bounce_rate>
-						<exit_rate>100%</exit_rate>
-						<avg_time_generation>0.359</avg_time_generation>
-						<url>http://piwik.net/hello/world/6,681965</url>
-					</row>
-				</subtable>
-			</row>
-		</subtable>
-	</row>
 	<row>
 		<label>log-analytics</label>
 		<nb_visits>2</nb_visits>
@@ -967,6 +967,44 @@
 			</row>
 		</subtable>
 	</row>
+	<row>
+		<label>Topic</label>
+		<nb_visits>2</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>1</entry_nb_actions>
+		<entry_sum_visit_length>0</entry_sum_visit_length>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>100%</bounce_rate>
+		<exit_rate>50%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/hw43061</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<url>http://piwik.net/Topic/hw43061</url>
+			</row>
+		</subtable>
+	</row>
 	<row>
 		<label>/index.htm</label>
 		<nb_visits>1</nb_visits>
@@ -1215,6 +1253,48 @@
 			</row>
 		</subtable>
 	</row>
+	<row>
+		<label>Products</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+		<min_time_generation>0.109</min_time_generation>
+		<max_time_generation>0.109</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>3</entry_nb_actions>
+		<entry_sum_visit_length>2</entry_sum_visit_length>
+		<entry_bounce_count>0</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.109</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/theProduct</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+				<min_time_generation>0.109</min_time_generation>
+				<max_time_generation>0.109</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>3</entry_nb_actions>
+				<entry_sum_visit_length>2</entry_sum_visit_length>
+				<entry_bounce_count>0</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.109</avg_time_generation>
+				<url>http://piwik.net/Products/theProduct</url>
+			</row>
+		</subtable>
+	</row>
 	<row>
 		<label>this</label>
 		<nb_visits>1</nb_visits>
@@ -1381,35 +1461,6 @@
 			</row>
 		</subtable>
 	</row>
-	<row>
-		<label>Topic</label>
-		<nb_visits>1</nb_visits>
-		<nb_hits>1</nb_hits>
-		<sum_time_spent>0</sum_time_spent>
-		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-		<min_time_generation />
-		<max_time_generation>0</max_time_generation>
-		<exit_nb_visits>1</exit_nb_visits>
-		<avg_time_on_page>0</avg_time_on_page>
-		<bounce_rate>0%</bounce_rate>
-		<exit_rate>100%</exit_rate>
-		<avg_time_generation>0</avg_time_generation>
-		<subtable>
-			<row>
-				<label>/hw43061</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
-				<sum_time_spent>0</sum_time_spent>
-				<exit_nb_visits>1</exit_nb_visits>
-				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
-				<avg_time_on_page>0</avg_time_on_page>
-				<bounce_rate>0%</bounce_rate>
-				<exit_rate>100%</exit_rate>
-				<url>http://piwik.net/Topic/hw43061</url>
-			</row>
-		</subtable>
-	</row>
 	<row>
 		<label>translations</label>
 		<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
index 1b30d46416..020db101c3 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
@@ -2,8 +2,8 @@
 <result>
 	<row>
 		<label>Page Name not defined</label>
-		<nb_visits>25</nb_visits>
-		<nb_hits>25</nb_hits>
+		<nb_visits>26</nb_visits>
+		<nb_hits>27</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
 		<nb_hits_with_time_generation>4</nb_hits_with_time_generation>
 		<min_time_generation>0.001</min_time_generation>
@@ -16,22 +16,39 @@
 	</row>
 	<row>
 		<label>301</label>
-		<nb_visits>2</nb_visits>
-		<nb_hits>2</nb_hits>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
 		<sum_time_spent>180</sum_time_spent>
 		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 		<min_time_generation />
 		<max_time_generation>0</max_time_generation>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
+		<entry_nb_visits>2</entry_nb_visits>
+		<entry_nb_actions>3</entry_nb_actions>
 		<entry_sum_visit_length>182</entry_sum_visit_length>
-		<entry_bounce_count>0</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
-		<avg_time_on_page>90</avg_time_on_page>
-		<bounce_rate>0%</bounce_rate>
-		<exit_rate>50%</exit_rate>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>2</exit_nb_visits>
+		<avg_time_on_page>60</avg_time_on_page>
+		<bounce_rate>50%</bounce_rate>
+		<exit_rate>67%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<subtable>
+			<row>
+				<label> URL = http://piwik.net/Topic/hw43061</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+			</row>
 			<row>
 				<label> URL = http://piwik.net/moved-permanently</label>
 				<nb_visits>1</nb_visits>
@@ -47,24 +64,12 @@
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 			</row>
-			<row>
-				<label> URL = http://piwik.net/Topic/hw43061</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
-				<sum_time_spent>0</sum_time_spent>
-				<exit_nb_visits>1</exit_nb_visits>
-				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
-				<avg_time_on_page>0</avg_time_on_page>
-				<bounce_rate>0%</bounce_rate>
-				<exit_rate>100%</exit_rate>
-			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>404</label>
-		<nb_visits>2</nb_visits>
-		<nb_hits>2</nb_hits>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
 		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 		<min_time_generation>0.359</min_time_generation>
@@ -73,7 +78,7 @@
 		<entry_nb_actions>2</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
 		<entry_bounce_count>2</entry_bounce_count>
-		<exit_nb_visits>2</exit_nb_visits>
+		<exit_nb_visits>3</exit_nb_visits>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
@@ -81,8 +86,8 @@
 		<subtable>
 			<row>
 				<label> URL = http://piwik.net/hello/world/6,681965</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
 				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 				<min_time_generation>0.359</min_time_generation>
@@ -91,7 +96,7 @@
 				<entry_nb_actions>1</entry_nb_actions>
 				<entry_sum_visit_length>0</entry_sum_visit_length>
 				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
+				<exit_nb_visits>2</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
index 77a8d309dd..d9823b9bc3 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
@@ -2,8 +2,8 @@
 <result>
 	<row>
 		<label>Page Name not defined</label>
-		<nb_visits>26</nb_visits>
-		<nb_hits>35</nb_hits>
+		<nb_visits>27</nb_visits>
+		<nb_hits>37</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
 		<nb_hits_with_time_generation>14</nb_hits_with_time_generation>
 		<min_time_generation>0.001</min_time_generation>
@@ -37,22 +37,39 @@
 	</row>
 	<row>
 		<label>301</label>
-		<nb_visits>2</nb_visits>
-		<nb_hits>2</nb_hits>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
 		<sum_time_spent>180</sum_time_spent>
 		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 		<min_time_generation />
 		<max_time_generation>0</max_time_generation>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
+		<entry_nb_visits>2</entry_nb_visits>
+		<entry_nb_actions>3</entry_nb_actions>
 		<entry_sum_visit_length>182</entry_sum_visit_length>
-		<entry_bounce_count>0</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
-		<avg_time_on_page>90</avg_time_on_page>
-		<bounce_rate>0%</bounce_rate>
-		<exit_rate>50%</exit_rate>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>2</exit_nb_visits>
+		<avg_time_on_page>60</avg_time_on_page>
+		<bounce_rate>50%</bounce_rate>
+		<exit_rate>67%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<subtable>
+			<row>
+				<label> URL = http://piwik.net/Topic/hw43061</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+			</row>
 			<row>
 				<label> URL = http://piwik.net/moved-permanently</label>
 				<nb_visits>1</nb_visits>
@@ -68,24 +85,12 @@
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 			</row>
-			<row>
-				<label> URL = http://piwik.net/Topic/hw43061</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
-				<sum_time_spent>0</sum_time_spent>
-				<exit_nb_visits>1</exit_nb_visits>
-				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
-				<avg_time_on_page>0</avg_time_on_page>
-				<bounce_rate>0%</bounce_rate>
-				<exit_rate>100%</exit_rate>
-			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>404</label>
-		<nb_visits>2</nb_visits>
-		<nb_hits>2</nb_hits>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
 		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 		<min_time_generation>0.359</min_time_generation>
@@ -94,7 +99,7 @@
 		<entry_nb_actions>2</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
 		<entry_bounce_count>2</entry_bounce_count>
-		<exit_nb_visits>2</exit_nb_visits>
+		<exit_nb_visits>3</exit_nb_visits>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
@@ -102,8 +107,8 @@
 		<subtable>
 			<row>
 				<label> URL = http://piwik.net/hello/world/6,681965</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
 				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 				<min_time_generation>0.359</min_time_generation>
@@ -112,7 +117,7 @@
 				<entry_nb_actions>1</entry_nb_actions>
 				<entry_sum_visit_length>0</entry_sum_visit_length>
 				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
+				<exit_nb_visits>2</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
index 9f210503b1..00aa9c93a5 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
@@ -382,6 +382,150 @@
 			</row>
 		</subtable>
 	</row>
+	<row>
+		<label>hello</label>
+		<nb_visits>4</nb_visits>
+		<nb_hits>4</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+		<min_time_generation>0.359</min_time_generation>
+		<max_time_generation>0.359</max_time_generation>
+		<entry_nb_visits>3</entry_nb_visits>
+		<entry_nb_actions>4</entry_nb_actions>
+		<entry_sum_visit_length>2</entry_sum_visit_length>
+		<entry_bounce_count>2</entry_bounce_count>
+		<exit_nb_visits>3</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>67%</bounce_rate>
+		<exit_rate>75%</exit_rate>
+		<avg_time_generation>0.359</avg_time_generation>
+		<subtable>
+			<row>
+				<label>from</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>2</entry_nb_visits>
+				<entry_nb_actions>3</entry_nb_actions>
+				<entry_sum_visit_length>2</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>50%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>another</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>2</entry_nb_visits>
+						<entry_nb_actions>3</entry_nb_actions>
+						<entry_sum_visit_length>2</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>50%</bounce_rate>
+						<exit_rate>50%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<subtable>
+							<row>
+								<label>world</label>
+								<nb_visits>2</nb_visits>
+								<nb_hits>2</nb_hits>
+								<sum_time_spent>0</sum_time_spent>
+								<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+								<min_time_generation>0.359</min_time_generation>
+								<max_time_generation>0.359</max_time_generation>
+								<entry_nb_visits>2</entry_nb_visits>
+								<entry_nb_actions>3</entry_nb_actions>
+								<entry_sum_visit_length>2</entry_sum_visit_length>
+								<entry_bounce_count>1</entry_bounce_count>
+								<exit_nb_visits>1</exit_nb_visits>
+								<avg_time_on_page>0</avg_time_on_page>
+								<bounce_rate>50%</bounce_rate>
+								<exit_rate>50%</exit_rate>
+								<avg_time_generation>0.359</avg_time_generation>
+								<subtable>
+									<row>
+										<label>/6,681965</label>
+										<nb_visits>2</nb_visits>
+										<nb_hits>2</nb_hits>
+										<sum_time_spent>0</sum_time_spent>
+										<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+										<min_time_generation>0.359</min_time_generation>
+										<max_time_generation>0.359</max_time_generation>
+										<entry_nb_visits>2</entry_nb_visits>
+										<entry_nb_actions>3</entry_nb_actions>
+										<entry_sum_visit_length>2</entry_sum_visit_length>
+										<entry_bounce_count>1</entry_bounce_count>
+										<exit_nb_visits>1</exit_nb_visits>
+										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+										<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+										<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+										<avg_time_on_page>0</avg_time_on_page>
+										<bounce_rate>50%</bounce_rate>
+										<exit_rate>50%</exit_rate>
+										<avg_time_generation>0.359</avg_time_generation>
+										<url>http://piwik.net/hello/from/another/world/6,681965</url>
+									</row>
+								</subtable>
+							</row>
+						</subtable>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>world</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>/6,681965</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>1</entry_nb_actions>
+						<entry_sum_visit_length>0</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>2</exit_nb_visits>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>100%</bounce_rate>
+						<exit_rate>100%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<url>http://piwik.net/hello/world/6,681965</url>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
 	<row>
 		<label>/index</label>
 		<nb_visits>3</nb_visits>
@@ -502,146 +646,40 @@
 		</subtable>
 	</row>
 	<row>
-		<label>hello</label>
+		<label>Topic</label>
 		<nb_visits>2</nb_visits>
 		<nb_hits>2</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
-		<min_time_generation>0.359</min_time_generation>
-		<max_time_generation>0.359</max_time_generation>
-		<entry_nb_visits>2</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
-		<entry_sum_visit_length>1</entry_sum_visit_length>
-		<entry_bounce_count>2</entry_bounce_count>
-		<exit_nb_visits>2</exit_nb_visits>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>1</entry_nb_actions>
+		<entry_sum_visit_length>0</entry_sum_visit_length>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
-		<exit_rate>100%</exit_rate>
-		<avg_time_generation>0.359</avg_time_generation>
+		<exit_rate>50%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
-				<label>from</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
-				<sum_time_spent>0</sum_time_spent>
-				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-				<min_time_generation>0.359</min_time_generation>
-				<max_time_generation>0.359</max_time_generation>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>1</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
-				<avg_time_on_page>0</avg_time_on_page>
-				<bounce_rate>100%</bounce_rate>
-				<exit_rate>100%</exit_rate>
-				<avg_time_generation>0.359</avg_time_generation>
-				<subtable>
-					<row>
-						<label>another</label>
-						<nb_visits>1</nb_visits>
-						<nb_hits>1</nb_hits>
-						<sum_time_spent>0</sum_time_spent>
-						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-						<min_time_generation>0.359</min_time_generation>
-						<max_time_generation>0.359</max_time_generation>
-						<entry_nb_visits>1</entry_nb_visits>
-						<entry_nb_actions>1</entry_nb_actions>
-						<entry_sum_visit_length>1</entry_sum_visit_length>
-						<entry_bounce_count>1</entry_bounce_count>
-						<exit_nb_visits>1</exit_nb_visits>
-						<avg_time_on_page>0</avg_time_on_page>
-						<bounce_rate>100%</bounce_rate>
-						<exit_rate>100%</exit_rate>
-						<avg_time_generation>0.359</avg_time_generation>
-						<subtable>
-							<row>
-								<label>world</label>
-								<nb_visits>1</nb_visits>
-								<nb_hits>1</nb_hits>
-								<sum_time_spent>0</sum_time_spent>
-								<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-								<min_time_generation>0.359</min_time_generation>
-								<max_time_generation>0.359</max_time_generation>
-								<entry_nb_visits>1</entry_nb_visits>
-								<entry_nb_actions>1</entry_nb_actions>
-								<entry_sum_visit_length>1</entry_sum_visit_length>
-								<entry_bounce_count>1</entry_bounce_count>
-								<exit_nb_visits>1</exit_nb_visits>
-								<avg_time_on_page>0</avg_time_on_page>
-								<bounce_rate>100%</bounce_rate>
-								<exit_rate>100%</exit_rate>
-								<avg_time_generation>0.359</avg_time_generation>
-								<subtable>
-									<row>
-										<label>/6,681965</label>
-										<nb_visits>1</nb_visits>
-										<nb_hits>1</nb_hits>
-										<sum_time_spent>0</sum_time_spent>
-										<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-										<min_time_generation>0.359</min_time_generation>
-										<max_time_generation>0.359</max_time_generation>
-										<entry_nb_visits>1</entry_nb_visits>
-										<entry_nb_actions>1</entry_nb_actions>
-										<entry_sum_visit_length>1</entry_sum_visit_length>
-										<entry_bounce_count>1</entry_bounce_count>
-										<exit_nb_visits>1</exit_nb_visits>
-										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-										<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-										<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
-										<avg_time_on_page>0</avg_time_on_page>
-										<bounce_rate>100%</bounce_rate>
-										<exit_rate>100%</exit_rate>
-										<avg_time_generation>0.359</avg_time_generation>
-										<url>http://piwik.net/hello/from/another/world/6,681965</url>
-									</row>
-								</subtable>
-							</row>
-						</subtable>
-					</row>
-				</subtable>
-			</row>
-			<row>
-				<label>world</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
+				<label>/hw43061</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-				<min_time_generation>0.359</min_time_generation>
-				<max_time_generation>0.359</max_time_generation>
 				<entry_nb_visits>1</entry_nb_visits>
 				<entry_nb_actions>1</entry_nb_actions>
 				<entry_sum_visit_length>0</entry_sum_visit_length>
 				<entry_bounce_count>1</entry_bounce_count>
 				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>100%</bounce_rate>
-				<exit_rate>100%</exit_rate>
-				<avg_time_generation>0.359</avg_time_generation>
-				<subtable>
-					<row>
-						<label>/6,681965</label>
-						<nb_visits>1</nb_visits>
-						<nb_hits>1</nb_hits>
-						<sum_time_spent>0</sum_time_spent>
-						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-						<min_time_generation>0.359</min_time_generation>
-						<max_time_generation>0.359</max_time_generation>
-						<entry_nb_visits>1</entry_nb_visits>
-						<entry_nb_actions>1</entry_nb_actions>
-						<entry_sum_visit_length>0</entry_sum_visit_length>
-						<entry_bounce_count>1</entry_bounce_count>
-						<exit_nb_visits>1</exit_nb_visits>
-						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
-						<avg_time_on_page>0</avg_time_on_page>
-						<bounce_rate>100%</bounce_rate>
-						<exit_rate>100%</exit_rate>
-						<avg_time_generation>0.359</avg_time_generation>
-						<url>http://piwik.net/hello/world/6,681965</url>
-					</row>
-				</subtable>
+				<exit_rate>50%</exit_rate>
+				<url>http://piwik.net/Topic/hw43061</url>
 			</row>
 		</subtable>
 	</row>
@@ -919,37 +957,40 @@
 	<row>
 		<label>Products</label>
 		<nb_visits>1</nb_visits>
-		<nb_hits>1</nb_hits>
+		<nb_hits>2</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
 		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 		<min_time_generation>0.109</min_time_generation>
 		<max_time_generation>0.109</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
+		<entry_nb_actions>3</entry_nb_actions>
 		<entry_sum_visit_length>2</entry_sum_visit_length>
 		<entry_bounce_count>0</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
-		<exit_rate>0%</exit_rate>
+		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.109</avg_time_generation>
 		<subtable>
 			<row>
 				<label>/theProduct</label>
 				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
+				<nb_hits>2</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
 				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 				<min_time_generation>0.109</min_time_generation>
 				<max_time_generation>0.109</max_time_generation>
 				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>2</entry_nb_actions>
+				<entry_nb_actions>3</entry_nb_actions>
 				<entry_sum_visit_length>2</entry_sum_visit_length>
 				<entry_bounce_count>0</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
-				<exit_rate>0%</exit_rate>
+				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.109</avg_time_generation>
 				<url>http://piwik.net/Products/theProduct</url>
 			</row>
@@ -1121,35 +1162,6 @@
 			</row>
 		</subtable>
 	</row>
-	<row>
-		<label>Topic</label>
-		<nb_visits>1</nb_visits>
-		<nb_hits>1</nb_hits>
-		<sum_time_spent>0</sum_time_spent>
-		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-		<min_time_generation />
-		<max_time_generation>0</max_time_generation>
-		<exit_nb_visits>1</exit_nb_visits>
-		<avg_time_on_page>0</avg_time_on_page>
-		<bounce_rate>0%</bounce_rate>
-		<exit_rate>100%</exit_rate>
-		<avg_time_generation>0</avg_time_generation>
-		<subtable>
-			<row>
-				<label>/hw43061</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
-				<sum_time_spent>0</sum_time_spent>
-				<exit_nb_visits>1</exit_nb_visits>
-				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
-				<avg_time_on_page>0</avg_time_on_page>
-				<bounce_rate>0%</bounce_rate>
-				<exit_rate>100%</exit_rate>
-				<url>http://piwik.net/Topic/hw43061</url>
-			</row>
-		</subtable>
-	</row>
 	<row>
 		<label>translations</label>
 		<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
index 1d66cacbe9..091e1215c8 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
@@ -646,6 +646,150 @@
 			</row>
 		</subtable>
 	</row>
+	<row>
+		<label>hello</label>
+		<nb_visits>4</nb_visits>
+		<nb_hits>4</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+		<min_time_generation>0.359</min_time_generation>
+		<max_time_generation>0.359</max_time_generation>
+		<entry_nb_visits>3</entry_nb_visits>
+		<entry_nb_actions>4</entry_nb_actions>
+		<entry_sum_visit_length>2</entry_sum_visit_length>
+		<entry_bounce_count>2</entry_bounce_count>
+		<exit_nb_visits>3</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>67%</bounce_rate>
+		<exit_rate>75%</exit_rate>
+		<avg_time_generation>0.359</avg_time_generation>
+		<subtable>
+			<row>
+				<label>from</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>2</entry_nb_visits>
+				<entry_nb_actions>3</entry_nb_actions>
+				<entry_sum_visit_length>2</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>50%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>another</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>2</entry_nb_visits>
+						<entry_nb_actions>3</entry_nb_actions>
+						<entry_sum_visit_length>2</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>50%</bounce_rate>
+						<exit_rate>50%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<subtable>
+							<row>
+								<label>world</label>
+								<nb_visits>2</nb_visits>
+								<nb_hits>2</nb_hits>
+								<sum_time_spent>0</sum_time_spent>
+								<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+								<min_time_generation>0.359</min_time_generation>
+								<max_time_generation>0.359</max_time_generation>
+								<entry_nb_visits>2</entry_nb_visits>
+								<entry_nb_actions>3</entry_nb_actions>
+								<entry_sum_visit_length>2</entry_sum_visit_length>
+								<entry_bounce_count>1</entry_bounce_count>
+								<exit_nb_visits>1</exit_nb_visits>
+								<avg_time_on_page>0</avg_time_on_page>
+								<bounce_rate>50%</bounce_rate>
+								<exit_rate>50%</exit_rate>
+								<avg_time_generation>0.359</avg_time_generation>
+								<subtable>
+									<row>
+										<label>/6,681965</label>
+										<nb_visits>2</nb_visits>
+										<nb_hits>2</nb_hits>
+										<sum_time_spent>0</sum_time_spent>
+										<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+										<min_time_generation>0.359</min_time_generation>
+										<max_time_generation>0.359</max_time_generation>
+										<entry_nb_visits>2</entry_nb_visits>
+										<entry_nb_actions>3</entry_nb_actions>
+										<entry_sum_visit_length>2</entry_sum_visit_length>
+										<entry_bounce_count>1</entry_bounce_count>
+										<exit_nb_visits>1</exit_nb_visits>
+										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+										<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+										<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+										<avg_time_on_page>0</avg_time_on_page>
+										<bounce_rate>50%</bounce_rate>
+										<exit_rate>50%</exit_rate>
+										<avg_time_generation>0.359</avg_time_generation>
+										<url>http://piwik.net/hello/from/another/world/6,681965</url>
+									</row>
+								</subtable>
+							</row>
+						</subtable>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>world</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>/6,681965</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>1</entry_nb_actions>
+						<entry_sum_visit_length>0</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>2</exit_nb_visits>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>100%</bounce_rate>
+						<exit_rate>100%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<url>http://piwik.net/hello/world/6,681965</url>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
 	<row>
 		<label>Citrix</label>
 		<nb_visits>2</nb_visits>
@@ -816,150 +960,6 @@
 			</row>
 		</subtable>
 	</row>
-	<row>
-		<label>hello</label>
-		<nb_visits>2</nb_visits>
-		<nb_hits>2</nb_hits>
-		<sum_time_spent>0</sum_time_spent>
-		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
-		<min_time_generation>0.359</min_time_generation>
-		<max_time_generation>0.359</max_time_generation>
-		<entry_nb_visits>2</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
-		<entry_sum_visit_length>1</entry_sum_visit_length>
-		<entry_bounce_count>2</entry_bounce_count>
-		<exit_nb_visits>2</exit_nb_visits>
-		<avg_time_on_page>0</avg_time_on_page>
-		<bounce_rate>100%</bounce_rate>
-		<exit_rate>100%</exit_rate>
-		<avg_time_generation>0.359</avg_time_generation>
-		<subtable>
-			<row>
-				<label>from</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
-				<sum_time_spent>0</sum_time_spent>
-				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-				<min_time_generation>0.359</min_time_generation>
-				<max_time_generation>0.359</max_time_generation>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>1</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
-				<avg_time_on_page>0</avg_time_on_page>
-				<bounce_rate>100%</bounce_rate>
-				<exit_rate>100%</exit_rate>
-				<avg_time_generation>0.359</avg_time_generation>
-				<subtable>
-					<row>
-						<label>another</label>
-						<nb_visits>1</nb_visits>
-						<nb_hits>1</nb_hits>
-						<sum_time_spent>0</sum_time_spent>
-						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-						<min_time_generation>0.359</min_time_generation>
-						<max_time_generation>0.359</max_time_generation>
-						<entry_nb_visits>1</entry_nb_visits>
-						<entry_nb_actions>1</entry_nb_actions>
-						<entry_sum_visit_length>1</entry_sum_visit_length>
-						<entry_bounce_count>1</entry_bounce_count>
-						<exit_nb_visits>1</exit_nb_visits>
-						<avg_time_on_page>0</avg_time_on_page>
-						<bounce_rate>100%</bounce_rate>
-						<exit_rate>100%</exit_rate>
-						<avg_time_generation>0.359</avg_time_generation>
-						<subtable>
-							<row>
-								<label>world</label>
-								<nb_visits>1</nb_visits>
-								<nb_hits>1</nb_hits>
-								<sum_time_spent>0</sum_time_spent>
-								<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-								<min_time_generation>0.359</min_time_generation>
-								<max_time_generation>0.359</max_time_generation>
-								<entry_nb_visits>1</entry_nb_visits>
-								<entry_nb_actions>1</entry_nb_actions>
-								<entry_sum_visit_length>1</entry_sum_visit_length>
-								<entry_bounce_count>1</entry_bounce_count>
-								<exit_nb_visits>1</exit_nb_visits>
-								<avg_time_on_page>0</avg_time_on_page>
-								<bounce_rate>100%</bounce_rate>
-								<exit_rate>100%</exit_rate>
-								<avg_time_generation>0.359</avg_time_generation>
-								<subtable>
-									<row>
-										<label>/6,681965</label>
-										<nb_visits>1</nb_visits>
-										<nb_hits>1</nb_hits>
-										<sum_time_spent>0</sum_time_spent>
-										<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-										<min_time_generation>0.359</min_time_generation>
-										<max_time_generation>0.359</max_time_generation>
-										<entry_nb_visits>1</entry_nb_visits>
-										<entry_nb_actions>1</entry_nb_actions>
-										<entry_sum_visit_length>1</entry_sum_visit_length>
-										<entry_bounce_count>1</entry_bounce_count>
-										<exit_nb_visits>1</exit_nb_visits>
-										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-										<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-										<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
-										<avg_time_on_page>0</avg_time_on_page>
-										<bounce_rate>100%</bounce_rate>
-										<exit_rate>100%</exit_rate>
-										<avg_time_generation>0.359</avg_time_generation>
-										<url>http://piwik.net/hello/from/another/world/6,681965</url>
-									</row>
-								</subtable>
-							</row>
-						</subtable>
-					</row>
-				</subtable>
-			</row>
-			<row>
-				<label>world</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
-				<sum_time_spent>0</sum_time_spent>
-				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-				<min_time_generation>0.359</min_time_generation>
-				<max_time_generation>0.359</max_time_generation>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
-				<avg_time_on_page>0</avg_time_on_page>
-				<bounce_rate>100%</bounce_rate>
-				<exit_rate>100%</exit_rate>
-				<avg_time_generation>0.359</avg_time_generation>
-				<subtable>
-					<row>
-						<label>/6,681965</label>
-						<nb_visits>1</nb_visits>
-						<nb_hits>1</nb_hits>
-						<sum_time_spent>0</sum_time_spent>
-						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-						<min_time_generation>0.359</min_time_generation>
-						<max_time_generation>0.359</max_time_generation>
-						<entry_nb_visits>1</entry_nb_visits>
-						<entry_nb_actions>1</entry_nb_actions>
-						<entry_sum_visit_length>0</entry_sum_visit_length>
-						<entry_bounce_count>1</entry_bounce_count>
-						<exit_nb_visits>1</exit_nb_visits>
-						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
-						<avg_time_on_page>0</avg_time_on_page>
-						<bounce_rate>100%</bounce_rate>
-						<exit_rate>100%</exit_rate>
-						<avg_time_generation>0.359</avg_time_generation>
-						<url>http://piwik.net/hello/world/6,681965</url>
-					</row>
-				</subtable>
-			</row>
-		</subtable>
-	</row>
 	<row>
 		<label>log-analytics</label>
 		<nb_visits>2</nb_visits>
@@ -1002,6 +1002,44 @@
 			</row>
 		</subtable>
 	</row>
+	<row>
+		<label>Topic</label>
+		<nb_visits>2</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>1</entry_nb_actions>
+		<entry_sum_visit_length>0</entry_sum_visit_length>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>100%</bounce_rate>
+		<exit_rate>50%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/hw43061</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<url>http://piwik.net/Topic/hw43061</url>
+			</row>
+		</subtable>
+	</row>
 	<row>
 		<label>/index.htm</label>
 		<nb_visits>1</nb_visits>
@@ -1308,37 +1346,40 @@
 	<row>
 		<label>Products</label>
 		<nb_visits>1</nb_visits>
-		<nb_hits>1</nb_hits>
+		<nb_hits>2</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
 		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 		<min_time_generation>0.109</min_time_generation>
 		<max_time_generation>0.109</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
+		<entry_nb_actions>3</entry_nb_actions>
 		<entry_sum_visit_length>2</entry_sum_visit_length>
 		<entry_bounce_count>0</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
-		<exit_rate>0%</exit_rate>
+		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.109</avg_time_generation>
 		<subtable>
 			<row>
 				<label>/theProduct</label>
 				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
+				<nb_hits>2</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
 				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 				<min_time_generation>0.109</min_time_generation>
 				<max_time_generation>0.109</max_time_generation>
 				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>2</entry_nb_actions>
+				<entry_nb_actions>3</entry_nb_actions>
 				<entry_sum_visit_length>2</entry_sum_visit_length>
 				<entry_bounce_count>0</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
-				<exit_rate>0%</exit_rate>
+				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.109</avg_time_generation>
 				<url>http://piwik.net/Products/theProduct</url>
 			</row>
@@ -1510,35 +1551,6 @@
 			</row>
 		</subtable>
 	</row>
-	<row>
-		<label>Topic</label>
-		<nb_visits>1</nb_visits>
-		<nb_hits>1</nb_hits>
-		<sum_time_spent>0</sum_time_spent>
-		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-		<min_time_generation />
-		<max_time_generation>0</max_time_generation>
-		<exit_nb_visits>1</exit_nb_visits>
-		<avg_time_on_page>0</avg_time_on_page>
-		<bounce_rate>0%</bounce_rate>
-		<exit_rate>100%</exit_rate>
-		<avg_time_generation>0</avg_time_generation>
-		<subtable>
-			<row>
-				<label>/hw43061</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
-				<sum_time_spent>0</sum_time_spent>
-				<exit_nb_visits>1</exit_nb_visits>
-				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
-				<avg_time_on_page>0</avg_time_on_page>
-				<bounce_rate>0%</bounce_rate>
-				<exit_rate>100%</exit_rate>
-				<url>http://piwik.net/Topic/hw43061</url>
-			</row>
-		</subtable>
-	</row>
 	<row>
 		<label>translations</label>
 		<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml
index 150bdad025..4e24f3a355 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
-	<nb_pageviews>34</nb_pageviews>
-	<nb_uniq_pageviews>34</nb_uniq_pageviews>
+	<nb_pageviews>38</nb_pageviews>
+	<nb_uniq_pageviews>37</nb_uniq_pageviews>
 	<nb_downloads>4</nb_downloads>
 	<nb_uniq_downloads>4</nb_uniq_downloads>
 	<nb_outlinks>0</nb_outlinks>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
index 2e427656e4..80680b1482 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
-	<nb_pageviews>58</nb_pageviews>
-	<nb_uniq_pageviews>52</nb_uniq_pageviews>
+	<nb_pageviews>62</nb_pageviews>
+	<nb_uniq_pageviews>55</nb_uniq_pageviews>
 	<nb_downloads>5</nb_downloads>
 	<nb_uniq_downloads>5</nb_uniq_downloads>
 	<nb_outlinks>1</nb_outlinks>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
index 0461769807..9545726b49 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
@@ -2,24 +2,24 @@
 <result>
 	<row>
 		<label>HTTP-code</label>
-		<nb_actions>39</nb_actions>
+		<nb_actions>43</nb_actions>
 		<subtable>
 			<row>
 				<label>200</label>
-				<nb_visits>30</nb_visits>
-				<nb_actions>32</nb_actions>
+				<nb_visits>31</nb_visits>
+				<nb_actions>34</nb_actions>
 				<sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors>
 			</row>
 			<row>
 				<label>301</label>
-				<nb_visits>2</nb_visits>
-				<nb_actions>2</nb_actions>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<nb_visits>3</nb_visits>
+				<nb_actions>3</nb_actions>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 			</row>
 			<row>
 				<label>404</label>
-				<nb_visits>2</nb_visits>
-				<nb_actions>2</nb_actions>
+				<nb_visits>3</nb_visits>
+				<nb_actions>3</nb_actions>
 				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 			</row>
 			<row>
@@ -131,6 +131,83 @@
 			</row>
 		</subtable>
 	</row>
+	<row>
+		<label>User Name</label>
+		<nb_visits>3</nb_visits>
+		<nb_actions>5</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>3</sum_visit_length>
+		<bounce_count>2</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>2</nb_conversions>
+				<nb_visits_converted>2</nb_visits_converted>
+				<revenue>10</revenue>
+			</row>
+		</goals>
+		<nb_conversions>2</nb_conversions>
+		<revenue>10</revenue>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<subtable>
+			<row>
+				<label>user1</label>
+				<nb_visits>2</nb_visits>
+				<nb_actions>4</nb_actions>
+				<max_actions>3</max_actions>
+				<sum_visit_length>2</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<goals>
+					<row idgoal='1'>
+						<nb_conversions>1</nb_conversions>
+						<nb_visits_converted>1</nb_visits_converted>
+						<revenue>5</revenue>
+					</row>
+				</goals>
+				<nb_conversions>1</nb_conversions>
+				<revenue>5</revenue>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_users>1</sum_daily_nb_users>
+			</row>
+			<row>
+				<label>user2</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<max_actions>1</max_actions>
+				<sum_visit_length>1</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<goals>
+					<row idgoal='1'>
+						<nb_conversions>1</nb_conversions>
+						<nb_visits_converted>1</nb_visits_converted>
+						<revenue>5</revenue>
+					</row>
+				</goals>
+				<nb_conversions>1</nb_conversions>
+				<revenue>5</revenue>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Generation Time</label>
+		<nb_actions>3</nb_actions>
+		<subtable>
+			<row>
+				<label>359</label>
+				<nb_visits>2</nb_visits>
+				<nb_actions>2</nb_actions>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			</row>
+			<row>
+				<label>109</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			</row>
+		</subtable>
+	</row>
 	<row>
 		<label>Bot</label>
 		<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml
index 9fd23368c3..b3aef9f3d3 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml
@@ -21,25 +21,25 @@
 	<row>
 		<label>Director</label>
 		<nb_visits>1</nb_visits>
-		<nb_visits_percentage>4%</nb_visits_percentage>
+		<nb_visits_percentage>3%</nb_visits_percentage>
 		<logo>plugins/DevicePlugins/images/plugins/director.gif</logo>
 	</row>
 	<row>
 		<label>Gears</label>
 		<nb_visits>1</nb_visits>
-		<nb_visits_percentage>4%</nb_visits_percentage>
+		<nb_visits_percentage>3%</nb_visits_percentage>
 		<logo>plugins/DevicePlugins/images/plugins/gears.gif</logo>
 	</row>
 	<row>
 		<label>Pdf</label>
 		<nb_visits>1</nb_visits>
-		<nb_visits_percentage>4%</nb_visits_percentage>
+		<nb_visits_percentage>3%</nb_visits_percentage>
 		<logo>plugins/DevicePlugins/images/plugins/pdf.gif</logo>
 	</row>
 	<row>
 		<label>Windowsmedia</label>
 		<nb_visits>1</nb_visits>
-		<nb_visits_percentage>4%</nb_visits_percentage>
+		<nb_visits_percentage>3%</nb_visits_percentage>
 		<logo>plugins/DevicePlugins/images/plugins/windowsmedia.gif</logo>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
index d587d75574..48593c4304 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
@@ -2,13 +2,13 @@
 <result>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>32</nb_visits>
-		<nb_actions>36</nb_actions>
+		<nb_visits>34</nb_visits>
+		<nb_actions>39</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>548</sum_visit_length>
-		<bounce_count>29</bounce_count>
-		<nb_visits_converted>28</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>31</sum_daily_nb_uniq_visitors>
+		<sum_visit_length>549</sum_visit_length>
+		<bounce_count>30</bounce_count>
+		<nb_visits_converted>30</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>32</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>1</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo>
 	</row>
@@ -27,8 +27,8 @@
 	<row>
 		<label>Samsung</label>
 		<nb_visits>1</nb_visits>
-		<nb_actions>2</nb_actions>
-		<max_actions>2</max_actions>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
 		<sum_visit_length>2</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
index afbf0a71a9..f404a50a9c 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
@@ -22,6 +22,17 @@
 		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
+	<row>
+		<label>Blink (Chrome, Opera)</label>
+		<nb_visits>6</nb_visits>
+		<nb_actions>9</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>4</bounce_count>
+		<nb_visits_converted>6</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>2</sum_daily_nb_users>
+	</row>
 	<row>
 		<label>Unknown</label>
 		<nb_visits>5</nb_visits>
@@ -33,17 +44,6 @@
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
-	<row>
-		<label>Blink (Chrome, Opera)</label>
-		<nb_visits>4</nb_visits>
-		<nb_actions>5</nb_actions>
-		<max_actions>2</max_actions>
-		<sum_visit_length>3</sum_visit_length>
-		<bounce_count>3</bounce_count>
-		<nb_visits_converted>4</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
-	</row>
 	<row>
 		<label>Gecko (Firefox)</label>
 		<nb_visits>2</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
index 300d043e61..930e0f0aa7 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
@@ -2,13 +2,13 @@
 <result>
 	<row>
 		<label>Chrome</label>
-		<nb_visits>8</nb_visits>
-		<nb_actions>8</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>1</sum_visit_length>
-		<bounce_count>8</bounce_count>
-		<nb_visits_converted>8</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
+		<nb_visits>10</nb_visits>
+		<nb_actions>11</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>9</bounce_count>
+		<nb_visits_converted>10</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>1</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
 	</row>
@@ -87,8 +87,8 @@
 	<row>
 		<label>Chrome Mobile</label>
 		<nb_visits>1</nb_visits>
-		<nb_actions>2</nb_actions>
-		<max_actions>2</max_actions>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
 		<sum_visit_length>2</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
index e7eab96c0e..27811a9911 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
@@ -48,6 +48,18 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
 	</row>
+	<row>
+		<label>Chrome 37.0</label>
+		<nb_visits>3</nb_visits>
+		<nb_actions>4</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>2</bounce_count>
+		<nb_visits_converted>3</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
+	</row>
 	<row>
 		<label>Android Browser</label>
 		<nb_visits>2</nb_visits>
@@ -84,18 +96,6 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
 	</row>
-	<row>
-		<label>Chrome 37.0</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>1</sum_visit_length>
-		<bounce_count>2</bounce_count>
-		<nb_visits_converted>2</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
-		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
-	</row>
 	<row>
 		<label>Firefox 6.0</label>
 		<nb_visits>2</nb_visits>
@@ -132,11 +132,23 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
 	</row>
+	<row>
+		<label>Chrome 41.0</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
+	</row>
 	<row>
 		<label>Chrome Mobile 39.0</label>
 		<nb_visits>1</nb_visits>
-		<nb_actions>2</nb_actions>
-		<max_actions>2</max_actions>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
 		<sum_visit_length>2</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
index 300d043e61..930e0f0aa7 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
@@ -2,13 +2,13 @@
 <result>
 	<row>
 		<label>Chrome</label>
-		<nb_visits>8</nb_visits>
-		<nb_actions>8</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>1</sum_visit_length>
-		<bounce_count>8</bounce_count>
-		<nb_visits_converted>8</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
+		<nb_visits>10</nb_visits>
+		<nb_actions>11</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>9</bounce_count>
+		<nb_visits_converted>10</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>1</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
 	</row>
@@ -87,8 +87,8 @@
 	<row>
 		<label>Chrome Mobile</label>
 		<nb_visits>1</nb_visits>
-		<nb_actions>2</nb_actions>
-		<max_actions>2</max_actions>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
 		<sum_visit_length>2</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
index 46bc313815..98c5db77ba 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
@@ -2,13 +2,13 @@
 <result>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>32</nb_visits>
-		<nb_actions>36</nb_actions>
+		<nb_visits>34</nb_visits>
+		<nb_actions>39</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>548</sum_visit_length>
-		<bounce_count>29</bounce_count>
-		<nb_visits_converted>28</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>31</sum_daily_nb_uniq_visitors>
+		<sum_visit_length>549</sum_visit_length>
+		<bounce_count>30</bounce_count>
+		<nb_visits_converted>30</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>32</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>1</sum_daily_nb_users>
 	</row>
 	<row>
@@ -25,8 +25,8 @@
 	<row>
 		<label>GALAXY S5</label>
 		<nb_visits>1</nb_visits>
-		<nb_actions>2</nb_actions>
-		<max_actions>2</max_actions>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
 		<sum_visit_length>2</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
index 47cdeba55f..813ebfe05a 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
+	<row>
+		<label>Mac</label>
+		<nb_visits>11</nb_visits>
+		<nb_actions>15</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>307</sum_visit_length>
+		<bounce_count>8</bounce_count>
+		<nb_visits_converted>10</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
+	</row>
 	<row>
 		<label>Windows</label>
 		<nb_visits>11</nb_visits>
@@ -12,18 +24,6 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
 	</row>
-	<row>
-		<label>Mac</label>
-		<nb_visits>9</nb_visits>
-		<nb_actions>12</nb_actions>
-		<max_actions>3</max_actions>
-		<sum_visit_length>306</sum_visit_length>
-		<bounce_count>7</bounce_count>
-		<nb_visits_converted>8</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
-		<logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
-	</row>
 	<row>
 		<label>GNU/Linux</label>
 		<nb_visits>8</nb_visits>
@@ -39,8 +39,8 @@
 	<row>
 		<label>Android</label>
 		<nb_visits>3</nb_visits>
-		<nb_actions>4</nb_actions>
-		<max_actions>2</max_actions>
+		<nb_actions>5</nb_actions>
+		<max_actions>3</max_actions>
 		<sum_visit_length>2</sum_visit_length>
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>3</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
index bc39002b6b..0bd4f21719 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
@@ -36,6 +36,18 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
 	</row>
+	<row>
+		<label>Mac 10.10</label>
+		<nb_visits>4</nb_visits>
+		<nb_actions>5</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<nb_visits_converted>4</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
+	</row>
 	<row>
 		<label>Unknown</label>
 		<nb_visits>3</nb_visits>
@@ -72,23 +84,11 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/os/AND.gif</logo>
 	</row>
-	<row>
-		<label>Mac 10.10</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>1</sum_visit_length>
-		<bounce_count>2</bounce_count>
-		<nb_visits_converted>2</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
-		<logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
-	</row>
 	<row>
 		<label>Android 4.4</label>
 		<nb_visits>1</nb_visits>
-		<nb_actions>2</nb_actions>
-		<max_actions>2</max_actions>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
 		<sum_visit_length>2</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
index f0b75e7e3d..7029c34a16 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
@@ -2,13 +2,13 @@
 <result>
 	<row>
 		<label>Desktop</label>
-		<nb_visits>28</nb_visits>
-		<nb_actions>32</nb_actions>
+		<nb_visits>30</nb_visits>
+		<nb_actions>35</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>548</sum_visit_length>
-		<bounce_count>25</bounce_count>
-		<nb_visits_converted>27</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors>
+		<sum_visit_length>549</sum_visit_length>
+		<bounce_count>26</bounce_count>
+		<nb_visits_converted>29</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>1</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/screens/normal.gif</logo>
 	</row>
@@ -27,8 +27,8 @@
 	<row>
 		<label>Smartphone</label>
 		<nb_visits>3</nb_visits>
-		<nb_actions>4</nb_actions>
-		<max_actions>2</max_actions>
+		<nb_actions>5</nb_actions>
+		<max_actions>3</max_actions>
 		<sum_visit_length>2</sum_visit_length>
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>3</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
index f809173bb4..e8f75dee69 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
@@ -2,7 +2,7 @@
 <result>
 	<row>
 		<label>0 days</label>
-		<nb_conversions>30</nb_conversions>
+		<nb_conversions>32</nb_conversions>
 	</row>
 	<row>
 		<label>1 day</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
index 680f349ccc..f906c7ccaf 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
@@ -2,7 +2,7 @@
 <result>
 	<row>
 		<label>1 visit</label>
-		<nb_conversions>31</nb_conversions>
+		<nb_conversions>33</nb_conversions>
 	</row>
 	<row>
 		<label>2 visits</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
index 279193ac22..7ada36be0d 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
-	<nb_conversions>31</nb_conversions>
-	<nb_visits_converted>31</nb_visits_converted>
-	<revenue>155</revenue>
-	<conversion_rate>88.57%</conversion_rate>
+	<nb_conversions>33</nb_conversions>
+	<nb_visits_converted>33</nb_visits_converted>
+	<revenue>165</revenue>
+	<conversion_rate>89.19%</conversion_rate>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
index fc02d32884..e86830b4d1 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
@@ -2084,7 +2084,7 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>44</idVisit>
+		<idVisit>51</idVisit>
 		<visitIp>173.5.0.0</visitIp>
 		
 		<actionDetails>
@@ -2093,7 +2093,7 @@
 				<goalName>all</goalName>
 				<goalId>1</goalId>
 				<revenue>5</revenue>
-				<goalPageId>61</goalPageId>
+				<goalPageId>71</goalPageId>
 				
 				<url>http://piwik.net/hello/from/another/world/6,681965</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
@@ -2105,14 +2105,17 @@
 				<pageTitle />
 				<pageIdAction>60</pageIdAction>
 				
-				<pageId>61</pageId>
+				<pageId>71</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
+					<row>
+						<customVariablePageName2>Generation Time</customVariablePageName2>
+						<customVariablePageValue2>359</customVariablePageValue2>
+					</row>
 				</customVariables>
-				<generationTime>0.36s</generationTime>
 				<icon />
 				
 			</row>
@@ -2124,7 +2127,7 @@
 		
 		
 		
-		<userId>user2</userId>
+		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -2179,6 +2182,10 @@
 		<providerName>Unknown</providerName>
 		<providerUrl />
 		<customVariables>
+			<row>
+				<customVariableName1>User Name</customVariableName1>
+				<customVariableValue1>user2</customVariableValue1>
+			</row>
 		</customVariables>
 		<resolution>unknown</resolution>
 		<plugins />
@@ -2238,6 +2245,28 @@
 						<customVariablePageValue1>301</customVariablePageValue1>
 					</row>
 				</customVariables>
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
+				<icon />
+				
+			</row>
+			<row>
+				<type>action</type>
+				<url>http://piwik.net/Products/theProduct</url>
+				<pageTitle />
+				<pageIdAction>55</pageIdAction>
+				
+				<pageId>68</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+					<row>
+						<customVariablePageName2>Generation Time</customVariablePageName2>
+						<customVariablePageValue2>109</customVariablePageValue2>
+					</row>
+				</customVariables>
 				<icon />
 				
 			</row>
@@ -2263,7 +2292,7 @@
 		<visitDuration>2</visitDuration>
 		<visitDurationPretty>2s</visitDurationPretty>
 		<searches>0</searches>
-		<actions>2</actions>
+		<actions>3</actions>
 		<referrerType>website</referrerType>
 		<referrerTypeName>Websites</referrerTypeName>
 		<referrerName>example.com</referrerName>
@@ -2304,6 +2333,10 @@
 		<providerName>Unknown</providerName>
 		<providerUrl />
 		<customVariables>
+			<row>
+				<customVariableName1>User Name</customVariableName1>
+				<customVariableValue1>user1</customVariableValue1>
+			</row>
 		</customVariables>
 		<resolution>unknown</resolution>
 		<plugins />
@@ -2420,6 +2453,245 @@
 		
 		
 		
+	</row>
+	<row>
+		<idSite>1</idSite>
+		<idVisit>44</idVisit>
+		<visitIp>173.5.0.0</visitIp>
+		
+		<actionDetails>
+			<row>
+				<type>action</type>
+				<url>http://piwik.net/hello/world/6,681965</url>
+				<pageTitle>404/URL = http%3A%2F%2Fpiwik.net%2Fhello%2Fworld%2F6%2C681965</pageTitle>
+				<pageIdAction>59</pageIdAction>
+				
+				<pageId>70</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>404</customVariablePageValue1>
+					</row>
+					<row>
+						<customVariablePageName2>Generation Time</customVariablePageName2>
+						<customVariablePageValue2>359</customVariablePageValue2>
+					</row>
+				</customVariables>
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
+				<icon />
+				
+			</row>
+			<row>
+				<type>goal</type>
+				<goalName>all</goalName>
+				<goalId>1</goalId>
+				<revenue>5</revenue>
+				<goalPageId>61</goalPageId>
+				
+				<url>http://piwik.net/hello/from/another/world/6,681965</url>
+				<icon>plugins/Morpheus/images/goal.png</icon>
+				
+			</row>
+			<row>
+				<type>action</type>
+				<url>http://piwik.net/hello/from/another/world/6,681965</url>
+				<pageTitle />
+				<pageIdAction>60</pageIdAction>
+				
+				<pageId>61</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<generationTime>0.36s</generationTime>
+				<icon />
+				
+			</row>
+		</actionDetails>
+		<goalConversions>1</goalConversions>
+		<siteCurrency>USD</siteCurrency>
+		<siteCurrencySymbol>$</siteCurrencySymbol>
+		
+		
+		
+		
+		<userId>user2</userId>
+		<visitorType>returning</visitorType>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+		<visitCount>1</visitCount>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
+		<daysSinceFirstVisit>0</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+		<visitDuration>1</visitDuration>
+		<visitDurationPretty>1s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>2</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Mac 10.10</operatingSystem>
+		<operatingSystemName>Mac</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
+		<operatingSystemCode>MAC</operatingSystemCode>
+		<operatingSystemVersion>10.10</operatingSystemVersion>
+		<browserFamily>Blink</browserFamily>
+		<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
+		<browser>Chrome 37.0</browser>
+		<browserName>Chrome</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
+		<browserCode>CH</browserCode>
+		<browserVersion>37.0</browserVersion>
+		<events>0</events>
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>United States</country>
+		<countryCode>us</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>United States</location>
+		<latitude>38</latitude>
+		<longitude>-97</longitude>
+		<visitLocalTime>17:30:00</visitLocalTime>
+		<visitLocalHour>17</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
+		
+		
+		
+		
+		
+	</row>
+	<row>
+		<idSite>1</idSite>
+		<idVisit>50</idVisit>
+		<visitIp>70.95.32.0</visitIp>
+		
+		<actionDetails>
+			<row>
+				<type>goal</type>
+				<goalName>all</goalName>
+				<goalId>1</goalId>
+				<revenue>5</revenue>
+				<goalPageId>69</goalPageId>
+				
+				<url>http://piwik.net/Topic/hw43061</url>
+				<icon>plugins/Morpheus/images/goal.png</icon>
+				
+			</row>
+			<row>
+				<type>action</type>
+				<url>http://piwik.net/Topic/hw43061</url>
+				<pageTitle>301/URL = http%3A%2F%2Fpiwik.net%2FTopic%2Fhw43061</pageTitle>
+				<pageIdAction>57</pageIdAction>
+				
+				<pageId>69</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>301</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<icon />
+				
+			</row>
+		</actionDetails>
+		<goalConversions>1</goalConversions>
+		<siteCurrency>USD</siteCurrency>
+		<siteCurrencySymbol>$</siteCurrencySymbol>
+		
+		
+		
+		
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+		<visitCount>1</visitCount>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
+		<daysSinceFirstVisit>0</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Mac 10.10</operatingSystem>
+		<operatingSystemName>Mac</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
+		<operatingSystemCode>MAC</operatingSystemCode>
+		<operatingSystemVersion>10.10</operatingSystemVersion>
+		<browserFamily>Blink</browserFamily>
+		<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
+		<browser>Chrome 41.0</browser>
+		<browserName>Chrome</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
+		<browserCode>CH</browserCode>
+		<browserVersion>41.0</browserVersion>
+		<events>0</events>
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>United States</country>
+		<countryCode>us</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>United States</location>
+		<latitude>38</latitude>
+		<longitude>-97</longitude>
+		<visitLocalTime>17:00:00</visitLocalTime>
+		<visitLocalHour>17</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>User Name</customVariableName1>
+				<customVariableValue1>user1</customVariableValue1>
+			</row>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
+		
+		
+		
+		
+		
 	</row>
 	<row>
 		<idSite>1</idSite>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml
index f886378415..74524d2848 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml
@@ -2,10 +2,10 @@
 <result>
 	<row>
 		<label>Piwik test</label>
-		<nb_visits>35</nb_visits>
-		<nb_actions>40</nb_actions>
-		<nb_pageviews>34</nb_pageviews>
-		<revenue>155</revenue>
+		<nb_visits>37</nb_visits>
+		<nb_actions>44</nb_actions>
+		<nb_pageviews>38</nb_pageviews>
+		<revenue>165</revenue>
 		<visits_evolution>100%</visits_evolution>
 		<actions_evolution>100%</actions_evolution>
 		<pageviews_evolution>100%</pageviews_evolution>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml
index 9e5b8fea23..79c9ff4ab6 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
-	<nb_visits>35</nb_visits>
-	<nb_actions>40</nb_actions>
+	<nb_visits>37</nb_visits>
+	<nb_actions>44</nb_actions>
 	<visits_evolution>100%</visits_evolution>
 	<actions_evolution>100%</actions_evolution>
 	<pageviews_evolution>100%</pageviews_evolution>
 	<revenue_evolution>100%</revenue_evolution>
-	<nb_pageviews>34</nb_pageviews>
-	<revenue>155</revenue>
+	<nb_pageviews>38</nb_pageviews>
+	<revenue>165</revenue>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml
index 114584b2a0..5078a3ef19 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml
@@ -2,13 +2,13 @@
 <result>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>35</nb_visits>
-		<nb_actions>40</nb_actions>
+		<nb_visits>37</nb_visits>
+		<nb_actions>44</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>550</sum_visit_length>
-		<bounce_count>31</bounce_count>
-		<nb_visits_converted>31</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>34</sum_daily_nb_uniq_visitors>
+		<sum_visit_length>551</sum_visit_length>
+		<bounce_count>32</bounce_count>
+		<nb_visits_converted>33</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>35</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>2</sum_daily_nb_users>
 		<url />
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml
index a867c32924..c9f1986b2e 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml
@@ -63,8 +63,8 @@
 	<row>
 		<label>example.com</label>
 		<nb_visits>1</nb_visits>
-		<nb_actions>2</nb_actions>
-		<max_actions>2</max_actions>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
 		<sum_visit_length>2</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<goals>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
index 023263f93e..b0ecf5b676 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
@@ -2,29 +2,29 @@
 <result>
 	<row>
 		<label>Direct Entry</label>
-		<nb_visits>31</nb_visits>
-		<nb_actions>35</nb_actions>
+		<nb_visits>33</nb_visits>
+		<nb_actions>38</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>548</sum_visit_length>
-		<bounce_count>28</bounce_count>
+		<sum_visit_length>549</sum_visit_length>
+		<bounce_count>29</bounce_count>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>27</nb_conversions>
-				<nb_visits_converted>27</nb_visits_converted>
-				<revenue>135</revenue>
+				<nb_conversions>29</nb_conversions>
+				<nb_visits_converted>29</nb_visits_converted>
+				<revenue>145</revenue>
 			</row>
 		</goals>
-		<nb_conversions>27</nb_conversions>
-		<revenue>135</revenue>
-		<sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors>
+		<nb_conversions>29</nb_conversions>
+		<revenue>145</revenue>
+		<sum_daily_nb_uniq_visitors>31</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>1</sum_daily_nb_users>
 		<nb_visits_converted>0</nb_visits_converted>
 	</row>
 	<row>
 		<label>Websites</label>
 		<nb_visits>4</nb_visits>
-		<nb_actions>5</nb_actions>
-		<max_actions>2</max_actions>
+		<nb_actions>6</nb_actions>
+		<max_actions>3</max_actions>
 		<sum_visit_length>2</sum_visit_length>
 		<bounce_count>3</bounce_count>
 		<goals>
@@ -42,8 +42,8 @@
 			<row>
 				<label>example.com</label>
 				<nb_visits>1</nb_visits>
-				<nb_actions>2</nb_actions>
-				<max_actions>2</max_actions>
+				<nb_actions>3</nb_actions>
+				<max_actions>3</max_actions>
 				<sum_visit_length>2</sum_visit_length>
 				<bounce_count>0</bounce_count>
 				<goals>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml
index c821ba7a36..99d6b9258c 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml
@@ -3,8 +3,8 @@
 	<row>
 		<label>example.com</label>
 		<nb_visits>1</nb_visits>
-		<nb_actions>2</nb_actions>
-		<max_actions>2</max_actions>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
 		<sum_visit_length>2</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<goals>
@@ -22,8 +22,8 @@
 			<row>
 				<label>http://example.com/Search/SearchResults.pg?informationRecipient.languageCode.c=en</label>
 				<nb_visits>1</nb_visits>
-				<nb_actions>2</nb_actions>
-				<max_actions>2</max_actions>
+				<nb_actions>3</nb_actions>
+				<max_actions>3</max_actions>
 				<sum_visit_length>2</sum_visit_length>
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml
index 3a11507be4..c1067505c8 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml
@@ -22,6 +22,17 @@
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
+	<row>
+		<label>Mac / Chrome / unknown</label>
+		<nb_visits>5</nb_visits>
+		<nb_actions>6</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>4</bounce_count>
+		<nb_visits_converted>5</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+	</row>
 	<row>
 		<label>Mac / RockMelt / unknown</label>
 		<nb_visits>5</nb_visits>
@@ -33,17 +44,6 @@
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
-	<row>
-		<label>Mac / Chrome / unknown</label>
-		<nb_visits>3</nb_visits>
-		<nb_actions>3</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>1</sum_visit_length>
-		<bounce_count>3</bounce_count>
-		<nb_visits_converted>3</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
-	</row>
 	<row>
 		<label>Unknown / Unknown / unknown</label>
 		<nb_visits>3</nb_visits>
@@ -91,8 +91,8 @@
 	<row>
 		<label>Android / Chrome Mobile / unknown</label>
 		<nb_visits>1</nb_visits>
-		<nb_actions>2</nb_actions>
-		<max_actions>2</max_actions>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
 		<sum_visit_length>2</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml
index 221b657148..e676cce9fa 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml
@@ -2,13 +2,13 @@
 <result>
 	<row>
 		<label>unknown</label>
-		<nb_visits>33</nb_visits>
-		<nb_actions>38</nb_actions>
+		<nb_visits>35</nb_visits>
+		<nb_actions>42</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>550</sum_visit_length>
-		<bounce_count>29</bounce_count>
-		<nb_visits_converted>29</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>32</sum_daily_nb_uniq_visitors>
+		<sum_visit_length>551</sum_visit_length>
+		<bounce_count>30</bounce_count>
+		<nb_visits_converted>31</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>2</sum_daily_nb_users>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
index 9cc9b9f08b..2af14a1f40 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
@@ -2,21 +2,21 @@
 <result>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>29</nb_visits>
-		<nb_actions>34</nb_actions>
+		<nb_visits>31</nb_visits>
+		<nb_actions>38</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>550</sum_visit_length>
-		<bounce_count>25</bounce_count>
+		<sum_visit_length>551</sum_visit_length>
+		<bounce_count>26</bounce_count>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>25</nb_conversions>
-				<nb_visits_converted>25</nb_visits_converted>
-				<revenue>125</revenue>
+				<nb_conversions>27</nb_conversions>
+				<nb_visits_converted>27</nb_visits_converted>
+				<revenue>135</revenue>
 			</row>
 		</goals>
-		<nb_conversions>25</nb_conversions>
-		<revenue>125</revenue>
-		<sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors>
+		<nb_conversions>27</nb_conversions>
+		<revenue>135</revenue>
+		<sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>2</sum_daily_nb_users>
 		<nb_visits_converted>0</nb_visits_converted>
 		<city_name>Unknown</city_name>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
index 4c91a66de1..13a7188162 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
@@ -43,21 +43,21 @@
 	</row>
 	<row>
 		<label>North America</label>
-		<nb_visits>9</nb_visits>
-		<nb_actions>10</nb_actions>
-		<max_actions>2</max_actions>
-		<sum_visit_length>3</sum_visit_length>
-		<bounce_count>8</bounce_count>
+		<nb_visits>11</nb_visits>
+		<nb_actions>14</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>9</bounce_count>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>9</nb_conversions>
-				<nb_visits_converted>9</nb_visits_converted>
-				<revenue>45</revenue>
+				<nb_conversions>11</nb_conversions>
+				<nb_visits_converted>11</nb_visits_converted>
+				<revenue>55</revenue>
 			</row>
 		</goals>
-		<nb_conversions>9</nb_conversions>
-		<revenue>45</revenue>
-		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
+		<nb_conversions>11</nb_conversions>
+		<revenue>55</revenue>
+		<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>2</sum_daily_nb_users>
 		<code>North America</code>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
index 71bd1968c4..149fedf47c 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
@@ -49,21 +49,21 @@
 	</row>
 	<row>
 		<label>United States</label>
-		<nb_visits>8</nb_visits>
-		<nb_actions>9</nb_actions>
-		<max_actions>2</max_actions>
-		<sum_visit_length>3</sum_visit_length>
-		<bounce_count>7</bounce_count>
+		<nb_visits>10</nb_visits>
+		<nb_actions>13</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>8</bounce_count>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>8</nb_conversions>
-				<nb_visits_converted>8</nb_visits_converted>
-				<revenue>40</revenue>
+				<nb_conversions>10</nb_conversions>
+				<nb_visits_converted>10</nb_visits_converted>
+				<revenue>50</revenue>
 			</row>
 		</goals>
-		<nb_conversions>8</nb_conversions>
-		<revenue>40</revenue>
-		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
+		<nb_conversions>10</nb_conversions>
+		<revenue>50</revenue>
+		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>2</sum_daily_nb_users>
 		<code>us</code>
 		<logo>plugins/UserCountry/images/flags/us.png</logo>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
index d85339344f..21c708618f 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
@@ -2,21 +2,21 @@
 <result>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>29</nb_visits>
-		<nb_actions>34</nb_actions>
+		<nb_visits>31</nb_visits>
+		<nb_actions>38</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>550</sum_visit_length>
-		<bounce_count>25</bounce_count>
+		<sum_visit_length>551</sum_visit_length>
+		<bounce_count>26</bounce_count>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>25</nb_conversions>
-				<nb_visits_converted>25</nb_visits_converted>
-				<revenue>125</revenue>
+				<nb_conversions>27</nb_conversions>
+				<nb_visits_converted>27</nb_visits_converted>
+				<revenue>135</revenue>
 			</row>
 		</goals>
-		<nb_conversions>25</nb_conversions>
-		<revenue>125</revenue>
-		<sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors>
+		<nb_conversions>27</nb_conversions>
+		<revenue>135</revenue>
+		<sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>2</sum_daily_nb_users>
 		<nb_visits_converted>0</nb_visits_converted>
 		<region>xx</region>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
index afbf0a71a9..f404a50a9c 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
@@ -22,6 +22,17 @@
 		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
+	<row>
+		<label>Blink (Chrome, Opera)</label>
+		<nb_visits>6</nb_visits>
+		<nb_actions>9</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>4</bounce_count>
+		<nb_visits_converted>6</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>2</sum_daily_nb_users>
+	</row>
 	<row>
 		<label>Unknown</label>
 		<nb_visits>5</nb_visits>
@@ -33,17 +44,6 @@
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
-	<row>
-		<label>Blink (Chrome, Opera)</label>
-		<nb_visits>4</nb_visits>
-		<nb_actions>5</nb_actions>
-		<max_actions>2</max_actions>
-		<sum_visit_length>3</sum_visit_length>
-		<bounce_count>3</bounce_count>
-		<nb_visits_converted>4</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
-	</row>
 	<row>
 		<label>Gecko (Firefox)</label>
 		<nb_visits>2</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
index e7eab96c0e..27811a9911 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
@@ -48,6 +48,18 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
 	</row>
+	<row>
+		<label>Chrome 37.0</label>
+		<nb_visits>3</nb_visits>
+		<nb_actions>4</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>2</bounce_count>
+		<nb_visits_converted>3</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
+	</row>
 	<row>
 		<label>Android Browser</label>
 		<nb_visits>2</nb_visits>
@@ -84,18 +96,6 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
 	</row>
-	<row>
-		<label>Chrome 37.0</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>1</sum_visit_length>
-		<bounce_count>2</bounce_count>
-		<nb_visits_converted>2</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
-		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
-	</row>
 	<row>
 		<label>Firefox 6.0</label>
 		<nb_visits>2</nb_visits>
@@ -132,11 +132,23 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
 	</row>
+	<row>
+		<label>Chrome 41.0</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
+	</row>
 	<row>
 		<label>Chrome Mobile 39.0</label>
 		<nb_visits>1</nb_visits>
-		<nb_actions>2</nb_actions>
-		<max_actions>2</max_actions>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
 		<sum_visit_length>2</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
index 300d043e61..930e0f0aa7 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
@@ -2,13 +2,13 @@
 <result>
 	<row>
 		<label>Chrome</label>
-		<nb_visits>8</nb_visits>
-		<nb_actions>8</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>1</sum_visit_length>
-		<bounce_count>8</bounce_count>
-		<nb_visits_converted>8</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
+		<nb_visits>10</nb_visits>
+		<nb_actions>11</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>9</bounce_count>
+		<nb_visits_converted>10</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>1</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
 	</row>
@@ -87,8 +87,8 @@
 	<row>
 		<label>Chrome Mobile</label>
 		<nb_visits>1</nb_visits>
-		<nb_actions>2</nb_actions>
-		<max_actions>2</max_actions>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
 		<sum_visit_length>2</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
index 3a11507be4..c1067505c8 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
@@ -22,6 +22,17 @@
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
+	<row>
+		<label>Mac / Chrome / unknown</label>
+		<nb_visits>5</nb_visits>
+		<nb_actions>6</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>4</bounce_count>
+		<nb_visits_converted>5</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+	</row>
 	<row>
 		<label>Mac / RockMelt / unknown</label>
 		<nb_visits>5</nb_visits>
@@ -33,17 +44,6 @@
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
-	<row>
-		<label>Mac / Chrome / unknown</label>
-		<nb_visits>3</nb_visits>
-		<nb_actions>3</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>1</sum_visit_length>
-		<bounce_count>3</bounce_count>
-		<nb_visits_converted>3</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
-	</row>
 	<row>
 		<label>Unknown / Unknown / unknown</label>
 		<nb_visits>3</nb_visits>
@@ -91,8 +91,8 @@
 	<row>
 		<label>Android / Chrome Mobile / unknown</label>
 		<nb_visits>1</nb_visits>
-		<nb_actions>2</nb_actions>
-		<max_actions>2</max_actions>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
 		<sum_visit_length>2</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml
index 55b8fea073..a65efd846c 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml
@@ -2,13 +2,13 @@
 <result>
 	<row>
 		<label>Unknown (xx)</label>
-		<nb_visits>35</nb_visits>
-		<nb_actions>40</nb_actions>
+		<nb_visits>37</nb_visits>
+		<nb_actions>44</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>550</sum_visit_length>
-		<bounce_count>31</bounce_count>
-		<nb_visits_converted>31</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>34</sum_daily_nb_uniq_visitors>
+		<sum_visit_length>551</sum_visit_length>
+		<bounce_count>32</bounce_count>
+		<nb_visits_converted>33</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>35</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>2</sum_daily_nb_users>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
index b8dd5583e4..dadcad320c 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
@@ -2,13 +2,13 @@
 <result>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>35</nb_visits>
-		<nb_actions>40</nb_actions>
+		<nb_visits>37</nb_visits>
+		<nb_actions>44</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>550</sum_visit_length>
-		<bounce_count>31</bounce_count>
-		<nb_visits_converted>31</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>34</sum_daily_nb_uniq_visitors>
+		<sum_visit_length>551</sum_visit_length>
+		<bounce_count>32</bounce_count>
+		<nb_visits_converted>33</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>35</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>2</sum_daily_nb_users>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
index f0b75e7e3d..7029c34a16 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
@@ -2,13 +2,13 @@
 <result>
 	<row>
 		<label>Desktop</label>
-		<nb_visits>28</nb_visits>
-		<nb_actions>32</nb_actions>
+		<nb_visits>30</nb_visits>
+		<nb_actions>35</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>548</sum_visit_length>
-		<bounce_count>25</bounce_count>
-		<nb_visits_converted>27</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors>
+		<sum_visit_length>549</sum_visit_length>
+		<bounce_count>26</bounce_count>
+		<nb_visits_converted>29</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>1</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/screens/normal.gif</logo>
 	</row>
@@ -27,8 +27,8 @@
 	<row>
 		<label>Smartphone</label>
 		<nb_visits>3</nb_visits>
-		<nb_actions>4</nb_actions>
-		<max_actions>2</max_actions>
+		<nb_actions>5</nb_actions>
+		<max_actions>3</max_actions>
 		<sum_visit_length>2</sum_visit_length>
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>3</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
index 47cdeba55f..813ebfe05a 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
+	<row>
+		<label>Mac</label>
+		<nb_visits>11</nb_visits>
+		<nb_actions>15</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>307</sum_visit_length>
+		<bounce_count>8</bounce_count>
+		<nb_visits_converted>10</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
+	</row>
 	<row>
 		<label>Windows</label>
 		<nb_visits>11</nb_visits>
@@ -12,18 +24,6 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
 	</row>
-	<row>
-		<label>Mac</label>
-		<nb_visits>9</nb_visits>
-		<nb_actions>12</nb_actions>
-		<max_actions>3</max_actions>
-		<sum_visit_length>306</sum_visit_length>
-		<bounce_count>7</bounce_count>
-		<nb_visits_converted>8</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
-		<logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
-	</row>
 	<row>
 		<label>GNU/Linux</label>
 		<nb_visits>8</nb_visits>
@@ -39,8 +39,8 @@
 	<row>
 		<label>Android</label>
 		<nb_visits>3</nb_visits>
-		<nb_actions>4</nb_actions>
-		<max_actions>2</max_actions>
+		<nb_actions>5</nb_actions>
+		<max_actions>3</max_actions>
 		<sum_visit_length>2</sum_visit_length>
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>3</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml
index bc39002b6b..0bd4f21719 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml
@@ -36,6 +36,18 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
 	</row>
+	<row>
+		<label>Mac 10.10</label>
+		<nb_visits>4</nb_visits>
+		<nb_actions>5</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<nb_visits_converted>4</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
+	</row>
 	<row>
 		<label>Unknown</label>
 		<nb_visits>3</nb_visits>
@@ -72,23 +84,11 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/os/AND.gif</logo>
 	</row>
-	<row>
-		<label>Mac 10.10</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>1</sum_visit_length>
-		<bounce_count>2</bounce_count>
-		<nb_visits_converted>2</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
-		<logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
-	</row>
 	<row>
 		<label>Android 4.4</label>
 		<nb_visits>1</nb_visits>
-		<nb_actions>2</nb_actions>
-		<max_actions>2</max_actions>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
 		<sum_visit_length>2</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
index 9fd23368c3..b3aef9f3d3 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
@@ -21,25 +21,25 @@
 	<row>
 		<label>Director</label>
 		<nb_visits>1</nb_visits>
-		<nb_visits_percentage>4%</nb_visits_percentage>
+		<nb_visits_percentage>3%</nb_visits_percentage>
 		<logo>plugins/DevicePlugins/images/plugins/director.gif</logo>
 	</row>
 	<row>
 		<label>Gears</label>
 		<nb_visits>1</nb_visits>
-		<nb_visits_percentage>4%</nb_visits_percentage>
+		<nb_visits_percentage>3%</nb_visits_percentage>
 		<logo>plugins/DevicePlugins/images/plugins/gears.gif</logo>
 	</row>
 	<row>
 		<label>Pdf</label>
 		<nb_visits>1</nb_visits>
-		<nb_visits_percentage>4%</nb_visits_percentage>
+		<nb_visits_percentage>3%</nb_visits_percentage>
 		<logo>plugins/DevicePlugins/images/plugins/pdf.gif</logo>
 	</row>
 	<row>
 		<label>Windowsmedia</label>
 		<nb_visits>1</nb_visits>
-		<nb_visits_percentage>4%</nb_visits_percentage>
+		<nb_visits_percentage>3%</nb_visits_percentage>
 		<logo>plugins/DevicePlugins/images/plugins/windowsmedia.gif</logo>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml
index 221b657148..e676cce9fa 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml
@@ -2,13 +2,13 @@
 <result>
 	<row>
 		<label>unknown</label>
-		<nb_visits>33</nb_visits>
-		<nb_actions>38</nb_actions>
+		<nb_visits>35</nb_visits>
+		<nb_actions>42</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>550</sum_visit_length>
-		<bounce_count>29</bounce_count>
-		<nb_visits_converted>29</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>32</sum_daily_nb_uniq_visitors>
+		<sum_visit_length>551</sum_visit_length>
+		<bounce_count>30</bounce_count>
+		<nb_visits_converted>31</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>2</sum_daily_nb_users>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml
index 02a0dc7272..8528e781f7 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml
@@ -2,13 +2,13 @@
 <result>
 	<nb_uniq_visitors_returning>2</nb_uniq_visitors_returning>
 	<nb_users_returning>1</nb_users_returning>
-	<nb_visits_returning>2</nb_visits_returning>
-	<nb_actions_returning>2</nb_actions_returning>
-	<nb_visits_converted_returning>2</nb_visits_converted_returning>
+	<nb_visits_returning>3</nb_visits_returning>
+	<nb_actions_returning>4</nb_actions_returning>
+	<nb_visits_converted_returning>3</nb_visits_converted_returning>
 	<bounce_count_returning>2</bounce_count_returning>
-	<sum_visit_length_returning>1</sum_visit_length_returning>
-	<max_actions_returning>1</max_actions_returning>
-	<bounce_rate_returning>100%</bounce_rate_returning>
-	<nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
+	<sum_visit_length_returning>2</sum_visit_length_returning>
+	<max_actions_returning>2</max_actions_returning>
+	<bounce_rate_returning>67%</bounce_rate_returning>
+	<nb_actions_per_visit_returning>1.3</nb_actions_per_visit_returning>
 	<avg_time_on_site_returning>1</avg_time_on_site_returning>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml
index c42125d072..779b4397e3 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
-	<nb_visits_returning>11</nb_visits_returning>
-	<nb_actions_returning>13</nb_actions_returning>
-	<nb_visits_converted_returning>10</nb_visits_converted_returning>
+	<nb_visits_returning>12</nb_visits_returning>
+	<nb_actions_returning>15</nb_actions_returning>
+	<nb_visits_converted_returning>11</nb_visits_converted_returning>
 	<bounce_count_returning>9</bounce_count_returning>
-	<sum_visit_length_returning>116</sum_visit_length_returning>
+	<sum_visit_length_returning>117</sum_visit_length_returning>
 	<max_actions_returning>2</max_actions_returning>
-	<bounce_rate_returning>82%</bounce_rate_returning>
-	<nb_actions_per_visit_returning>1.2</nb_actions_per_visit_returning>
-	<avg_time_on_site_returning>11</avg_time_on_site_returning>
+	<bounce_rate_returning>75%</bounce_rate_returning>
+	<nb_actions_per_visit_returning>1.3</nb_actions_per_visit_returning>
+	<avg_time_on_site_returning>10</avg_time_on_site_returning>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
index 68146f90f0..f23909c920 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
@@ -18,13 +18,13 @@
 	</row>
 	<row>
 		<label>Wednesday</label>
-		<nb_visits>5</nb_visits>
-		<nb_uniq_visitors>4</nb_uniq_visitors>
-		<nb_actions>6</nb_actions>
+		<nb_visits>7</nb_visits>
+		<nb_uniq_visitors>5</nb_uniq_visitors>
+		<nb_actions>10</nb_actions>
 		<nb_users>2</nb_users>
-		<sum_visit_length>3</sum_visit_length>
-		<bounce_count>4</bounce_count>
-		<nb_visits_converted>5</nb_visits_converted>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>5</bounce_count>
+		<nb_visits_converted>7</nb_visits_converted>
 		<day_of_week>3</day_of_week>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
index 72650afa13..fbdbbe9484 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
@@ -189,13 +189,13 @@
 	</row>
 	<row>
 		<label>17h</label>
-		<nb_visits>6</nb_visits>
-		<nb_actions>7</nb_actions>
-		<max_actions>2</max_actions>
-		<sum_visit_length>3</sum_visit_length>
-		<bounce_count>5</bounce_count>
-		<nb_visits_converted>5</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+		<nb_visits>8</nb_visits>
+		<nb_actions>11</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>6</bounce_count>
+		<nb_visits_converted>7</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>2</sum_daily_nb_users>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
index 9fee38a9a6..71a5de3ef5 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
@@ -270,23 +270,23 @@
 	</row>
 	<row>
 		<label>17h</label>
-		<nb_visits>6</nb_visits>
-		<nb_actions>7</nb_actions>
-		<max_actions>2</max_actions>
-		<sum_visit_length>3</sum_visit_length>
-		<bounce_count>5</bounce_count>
+		<nb_visits>8</nb_visits>
+		<nb_actions>11</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>6</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>2</sum_daily_nb_users>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>5</nb_conversions>
-				<nb_visits_converted>5</nb_visits_converted>
-				<revenue>25</revenue>
+				<nb_conversions>7</nb_conversions>
+				<nb_visits_converted>7</nb_visits_converted>
+				<revenue>35</revenue>
 			</row>
 		</goals>
-		<nb_conversions>5</nb_conversions>
-		<revenue>25</revenue>
+		<nb_conversions>7</nb_conversions>
+		<revenue>35</revenue>
 	</row>
 	<row>
 		<label>18h</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
index 47a2f53bfe..cfcc9e97d1 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
@@ -2,11 +2,11 @@
 <result>
 	<row>
 		<label>New visits</label>
-		<nb_visits>33</nb_visits>
+		<nb_visits>34</nb_visits>
 	</row>
 	<row>
 		<label>0 days</label>
-		<nb_visits>1</nb_visits>
+		<nb_visits>2</nb_visits>
 	</row>
 	<row>
 		<label>1 day</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
index 731eda4177..e5413c84fb 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
@@ -2,11 +2,11 @@
 <result>
 	<row>
 		<label>New visits</label>
-		<nb_visits>37</nb_visits>
+		<nb_visits>38</nb_visits>
 	</row>
 	<row>
 		<label>0 days</label>
-		<nb_visits>4</nb_visits>
+		<nb_visits>5</nb_visits>
 	</row>
 	<row>
 		<label>1 day</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
index e855ce559d..dbf2a47c48 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
@@ -2,7 +2,7 @@
 <result>
 	<row>
 		<label>1 visit</label>
-		<nb_visits>35</nb_visits>
+		<nb_visits>37</nb_visits>
 		<nb_visits_percentage>100%</nb_visits_percentage>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
index b661b86d45..789e9e8110 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
@@ -2,8 +2,8 @@
 <result>
 	<row>
 		<label>1 visit</label>
-		<nb_visits>41</nb_visits>
-		<nb_visits_percentage>85%</nb_visits_percentage>
+		<nb_visits>43</nb_visits>
+		<nb_visits_percentage>86%</nb_visits_percentage>
 	</row>
 	<row>
 		<label>2 visits</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
index 5d7a5da04d..8829c9b1a5 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
@@ -2,7 +2,7 @@
 <result>
 	<row>
 		<label>1 page</label>
-		<nb_visits>31</nb_visits>
+		<nb_visits>32</nb_visits>
 	</row>
 	<row>
 		<label>2 pages</label>
@@ -10,7 +10,7 @@
 	</row>
 	<row>
 		<label>3 pages</label>
-		<nb_visits>1</nb_visits>
+		<nb_visits>2</nb_visits>
 	</row>
 	<row>
 		<label>4 pages</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml
index a2fc0d31e4..d99a7802f0 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml
@@ -2,7 +2,7 @@
 <result>
 	<row>
 		<label>1 page</label>
-		<nb_visits>40</nb_visits>
+		<nb_visits>41</nb_visits>
 	</row>
 	<row>
 		<label>2 pages</label>
@@ -10,7 +10,7 @@
 	</row>
 	<row>
 		<label>3 pages</label>
-		<nb_visits>2</nb_visits>
+		<nb_visits>3</nb_visits>
 	</row>
 	<row>
 		<label>4 pages</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
index 12c0275f6c..eac22754d0 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
@@ -2,7 +2,7 @@
 <result>
 	<row>
 		<label>0-10s</label>
-		<nb_visits>32</nb_visits>
+		<nb_visits>34</nb_visits>
 	</row>
 	<row>
 		<label>11-30s</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml
index d7958450bf..0fa5658a92 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml
@@ -2,7 +2,7 @@
 <result>
 	<row>
 		<label>0-10s</label>
-		<nb_visits>42</nb_visits>
+		<nb_visits>44</nb_visits>
 	</row>
 	<row>
 		<label>11-30s</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
index a59088da03..1e4ba1a5cb 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>40</result>
\ No newline at end of file
+<result>44</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
index 51c650b8b2..a946f8e505 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>31</result>
\ No newline at end of file
+<result>32</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml
index e686bbc101..9ce15e5960 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>9 min 10s</result>
\ No newline at end of file
+<result>9 min 11s</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml
index 9674a59b3a..c3d46f00fb 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>550</result>
\ No newline at end of file
+<result>551</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
index 5c61a82137..8e4b837a62 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>34</result>
\ No newline at end of file
+<result>35</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
index 51c650b8b2..95aa700980 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>31</result>
\ No newline at end of file
+<result>33</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
index 8e4b837a62..51a0bb8472 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>35</result>
\ No newline at end of file
+<result>37</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
index 866786c235..1d536766e2 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
-	<nb_uniq_visitors>34</nb_uniq_visitors>
+	<nb_uniq_visitors>35</nb_uniq_visitors>
 	<nb_users>2</nb_users>
-	<nb_visits>35</nb_visits>
-	<nb_actions>40</nb_actions>
-	<nb_visits_converted>31</nb_visits_converted>
-	<bounce_count>31</bounce_count>
-	<sum_visit_length>550</sum_visit_length>
+	<nb_visits>37</nb_visits>
+	<nb_actions>44</nb_actions>
+	<nb_visits_converted>33</nb_visits_converted>
+	<bounce_count>32</bounce_count>
+	<sum_visit_length>551</sum_visit_length>
 	<max_actions>3</max_actions>
-	<bounce_rate>89%</bounce_rate>
-	<nb_actions_per_visit>1.1</nb_actions_per_visit>
-	<avg_time_on_site>16</avg_time_on_site>
+	<bounce_rate>86%</bounce_rate>
+	<nb_actions_per_visit>1.2</nb_actions_per_visit>
+	<avg_time_on_site>15</avg_time_on_site>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
index 500cb04dce..84d1611e02 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
@@ -3,11 +3,11 @@
 	<result date="2012-08">
 		<row>
 			<label>Piwik test</label>
-			<nb_visits>35</nb_visits>
-			<nb_actions>40</nb_actions>
-			<nb_pageviews>34</nb_pageviews>
-			<revenue>155</revenue>
-			<nb_conversions>31</nb_conversions>
+			<nb_visits>37</nb_visits>
+			<nb_actions>44</nb_actions>
+			<nb_pageviews>38</nb_pageviews>
+			<revenue>165</revenue>
+			<nb_conversions>33</nb_conversions>
 			<visits_evolution>100%</visits_evolution>
 			<actions_evolution>100%</actions_evolution>
 			<pageviews_evolution>100%</pageviews_evolution>
@@ -42,11 +42,11 @@
 			<nb_pageviews>10</nb_pageviews>
 			<revenue>5</revenue>
 			<nb_conversions>1</nb_conversions>
-			<visits_evolution>-97.1%</visits_evolution>
-			<actions_evolution>-75%</actions_evolution>
-			<pageviews_evolution>-70.6%</pageviews_evolution>
-			<revenue_evolution>-96.8%</revenue_evolution>
-			<nb_conversions_evolution>-96.8%</nb_conversions_evolution>
+			<visits_evolution>-97.3%</visits_evolution>
+			<actions_evolution>-77.3%</actions_evolution>
+			<pageviews_evolution>-73.7%</pageviews_evolution>
+			<revenue_evolution>-97%</revenue_evolution>
+			<nb_conversions_evolution>-97%</nb_conversions_evolution>
 			<group />
 			<main_url>http://piwik.net</main_url>
 			<idsite>1</idsite>
diff --git a/tests/UI/expected-ui-screenshots b/tests/UI/expected-ui-screenshots
index 07d791d599..e7b90c0fbd 160000
--- a/tests/UI/expected-ui-screenshots
+++ b/tests/UI/expected-ui-screenshots
@@ -1 +1 @@
-Subproject commit 07d791d599e1fc0828a9074ca81ee94bce91d356
+Subproject commit e7b90c0fbdeb9eace9f57271b8218eb31c02cb47
-- 
GitLab