diff --git a/misc/log-analytics b/misc/log-analytics
index f0d8d9722962275ff72316904d82a35bc78930cb..a07cbf926f6fbc64575c988c1a92cb42a427eea1 160000
--- a/misc/log-analytics
+++ b/misc/log-analytics
@@ -1 +1 @@
-Subproject commit f0d8d9722962275ff72316904d82a35bc78930cb
+Subproject commit a07cbf926f6fbc64575c988c1a92cb42a427eea1
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 2bb1a15667be75fe10013689f0821846e6001870..798759bceac94b2be04f8107e34af54c7cee914e 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
@@ -761,6 +761,48 @@
 		<url>http://piwik.net/to-an-error</url>
 		<segment>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
 	</row>
+	<row>
+		<label>api</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.009</min_time_generation>
+		<max_time_generation>0.009</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.009</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/fútbol-user-agent</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.009</min_time_generation>
+				<max_time_generation>0.009</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.009</avg_time_generation>
+				<url>http://piwik.net/api/fútbol-user-agent</url>
+			</row>
+		</subtable>
+	</row>
 	<row>
 		<label>download</label>
 		<nb_visits>1</nb_visits>
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 d1c53283d0d2fb6b70133be9390a1d842782ac1d..42dce8fbefc7b9688a518876aae450308b16e995 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
@@ -1122,6 +1122,48 @@
 		<url>http://piwik.net/to-an-error</url>
 		<segment>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
 	</row>
+	<row>
+		<label>api</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.009</min_time_generation>
+		<max_time_generation>0.009</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.009</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/fútbol-user-agent</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.009</min_time_generation>
+				<max_time_generation>0.009</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.009</avg_time_generation>
+				<url>http://piwik.net/api/fútbol-user-agent</url>
+			</row>
+		</subtable>
+	</row>
 	<row>
 		<label>changelog</label>
 		<nb_visits>1</nb_visits>
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 05350333b8dedad534b5d0023d02f308de2dd989..edf1ae59e6317e8cd43395e067c0eeecf1ce242f 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
@@ -755,6 +755,48 @@
 		<url>http://piwik.net/to-an-error</url>
 		<segment>exitPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
 	</row>
+	<row>
+		<label>api</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.009</min_time_generation>
+		<max_time_generation>0.009</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.009</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/fútbol-user-agent</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.009</min_time_generation>
+				<max_time_generation>0.009</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.009</avg_time_generation>
+				<url>http://piwik.net/api/fútbol-user-agent</url>
+			</row>
+		</subtable>
+	</row>
 	<row>
 		<label>download</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 e5240da08151c48653846dc3b5dfc4ba5db50032..6fc3cfd7ed5cf2b8f37dc07524ea67817faf7f20 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
@@ -1116,6 +1116,48 @@
 		<url>http://piwik.net/to-an-error</url>
 		<segment>exitPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
 	</row>
+	<row>
+		<label>api</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.009</min_time_generation>
+		<max_time_generation>0.009</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.009</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/fútbol-user-agent</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.009</min_time_generation>
+				<max_time_generation>0.009</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.009</avg_time_generation>
+				<url>http://piwik.net/api/fútbol-user-agent</url>
+			</row>
+		</subtable>
+	</row>
 	<row>
 		<label>contact</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 a56dd22637adeb198d1b394c3967cc8edc0ae161..4265021a1b386a663e51eef79acb7e832331f48c 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
@@ -2,17 +2,17 @@
 <result>
 	<row>
 		<label>Page Name not defined</label>
-		<nb_visits>27</nb_visits>
-		<nb_hits>28</nb_hits>
+		<nb_visits>28</nb_visits>
+		<nb_hits>29</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<nb_hits_with_time_generation>6</nb_hits_with_time_generation>
+		<nb_hits_with_time_generation>7</nb_hits_with_time_generation>
 		<min_time_generation>0.001</min_time_generation>
 		<max_time_generation>0.359</max_time_generation>
-		<sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
-		<avg_time_generation>0.156</avg_time_generation>
+		<avg_time_generation>0.135</avg_time_generation>
 	</row>
 	<row>
 		<label>301</label>
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 9ac6ea68c28d98d43869327aad94eada4571500f..24291fc91a95fb190358a2d8bcb08f12103666c6 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
@@ -2,17 +2,17 @@
 <result>
 	<row>
 		<label>Page Name not defined</label>
-		<nb_visits>28</nb_visits>
-		<nb_hits>38</nb_hits>
+		<nb_visits>29</nb_visits>
+		<nb_hits>39</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<nb_hits_with_time_generation>16</nb_hits_with_time_generation>
+		<nb_hits_with_time_generation>17</nb_hits_with_time_generation>
 		<min_time_generation>0.001</min_time_generation>
 		<max_time_generation>1.324</max_time_generation>
-		<sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
-		<avg_time_generation>0.3</avg_time_generation>
+		<avg_time_generation>0.283</avg_time_generation>
 	</row>
 	<row>
 		<label> Liberate Web Analytics - Analytics - Piwik</label>
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 cf6cb6491a08d8e1cdbd597ca167fe62f53d8fb1..5a2fb28be8787f19b7943a157b42f270c66f1e46 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
@@ -792,6 +792,48 @@
 		<url>http://piwik.net/to-an-error</url>
 		<segment>pageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
 	</row>
+	<row>
+		<label>api</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.009</min_time_generation>
+		<max_time_generation>0.009</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.009</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/fútbol-user-agent</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.009</min_time_generation>
+				<max_time_generation>0.009</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.009</avg_time_generation>
+				<url>http://piwik.net/api/fútbol-user-agent</url>
+			</row>
+		</subtable>
+	</row>
 	<row>
 		<label>download</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 6cad9e0d80ff8b92962cf8b871f616f615f29cae..23498166028f8e9df8def727993be781ecf5ee18 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
@@ -1172,6 +1172,48 @@
 		<url>http://piwik.net/to-an-error</url>
 		<segment>pageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
 	</row>
+	<row>
+		<label>api</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.009</min_time_generation>
+		<max_time_generation>0.009</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.009</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/fútbol-user-agent</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.009</min_time_generation>
+				<max_time_generation>0.009</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.009</avg_time_generation>
+				<url>http://piwik.net/api/fútbol-user-agent</url>
+			</row>
+		</subtable>
+	</row>
 	<row>
 		<label>changelog</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 a9f37fee8497557e441ca95f31ec463cf9850984..23f5051f83c4b02767e3f28dee44276a39660ee9 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
-	<nb_pageviews>39</nb_pageviews>
-	<nb_uniq_pageviews>38</nb_uniq_pageviews>
+	<nb_pageviews>40</nb_pageviews>
+	<nb_uniq_pageviews>39</nb_uniq_pageviews>
 	<nb_downloads>4</nb_downloads>
 	<nb_uniq_downloads>4</nb_uniq_downloads>
 	<nb_outlinks>0</nb_outlinks>
 	<nb_uniq_outlinks>0</nb_uniq_outlinks>
 	<nb_searches>0</nb_searches>
 	<nb_keywords>0</nb_keywords>
-	<avg_time_generation>0.206</avg_time_generation>
+	<avg_time_generation>0.184</avg_time_generation>
 </result>
\ No newline at end of file
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 f06074a2b3befc70f79f9189a351812010dc786c..bf02fbd84ba2cb37096955700d21f7498290cde9 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
-	<nb_pageviews>63</nb_pageviews>
-	<nb_uniq_pageviews>56</nb_uniq_pageviews>
+	<nb_pageviews>64</nb_pageviews>
+	<nb_uniq_pageviews>57</nb_uniq_pageviews>
 	<nb_downloads>5</nb_downloads>
 	<nb_uniq_downloads>5</nb_uniq_downloads>
 	<nb_outlinks>1</nb_outlinks>
 	<nb_uniq_outlinks>1</nb_uniq_outlinks>
 	<nb_searches>0</nb_searches>
 	<nb_keywords>0</nb_keywords>
-	<avg_time_generation>0.273</avg_time_generation>
+	<avg_time_generation>0.264</avg_time_generation>
 </result>
\ No newline at end of file
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 3746937e853ac73f21d8c97343e0b3b516b677aa..5996574d1f9ba5a5d921eea7fbeb22f313a6b0f0 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
@@ -2,7 +2,7 @@
 <result>
 	<row>
 		<label>HTTP-code</label>
-		<nb_actions>44</nb_actions>
+		<nb_actions>45</nb_actions>
 		<slots>
 			<row>
 				<scope>page</scope>
@@ -17,9 +17,9 @@
 		<subtable>
 			<row>
 				<label>200</label>
-				<nb_visits>33</nb_visits>
-				<nb_actions>35</nb_actions>
-				<sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors>
+				<nb_visits>34</nb_visits>
+				<nb_actions>36</nb_actions>
+				<sum_daily_nb_uniq_visitors>34</sum_daily_nb_uniq_visitors>
 			</row>
 			<row>
 				<label>301</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml
index 55ef69079d5a6706abb23785f840fead1fc3d594..190fff01c27727430ca2c2b7b74ed97f7ab38f7c 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml
@@ -72,7 +72,7 @@
 			<row>
 				<name>HTTP-code</name>
 				<nb_visits>0</nb_visits>
-				<nb_actions>70</nb_actions>
+				<nb_actions>71</nb_actions>
 			</row>
 			<row>
 				<name>Generation Time</name>
@@ -99,7 +99,7 @@
 			<row>
 				<name>HTTP-code</name>
 				<nb_visits>0</nb_visits>
-				<nb_actions>70</nb_actions>
+				<nb_actions>71</nb_actions>
 			</row>
 		</usages>
 	</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 08840cc821d11f95a99db4539a811116832578ec..7579eb0c5b06eec21ff6a75ab068a73a2927ed32 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
@@ -24,6 +24,18 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/brand/HTC.ico</logo>
 	</row>
+	<row>
+		<label>Apple</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/brand/Apple.ico</logo>
+	</row>
 	<row>
 		<label>Samsung</label>
 		<nb_visits>1</nb_visits>
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 4c4cb49892d5a53f6ec04ee11c8161b6abb5c473..3196bb0853eb461206df60ccaceb3026454a9a03 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
@@ -38,13 +38,13 @@
 	</row>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>4</nb_visits>
-		<nb_actions>4</nb_actions>
+		<nb_visits>5</nb_visits>
+		<nb_actions>5</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>4</bounce_count>
-		<nb_visits_converted>1</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<bounce_count>5</bounce_count>
+		<nb_visits_converted>2</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<segment>browserEngine==</segment>
 	</row>
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 d1231b5bb1b291003e097f0734569eb7ee2a8ddd..4f578d10dcf797bdc956b4243e8db858d6485fad 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
@@ -50,13 +50,13 @@
 	</row>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>4</nb_visits>
-		<nb_actions>4</nb_actions>
+		<nb_visits>5</nb_visits>
+		<nb_actions>5</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>4</bounce_count>
-		<nb_visits_converted>1</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<bounce_count>5</bounce_count>
+		<nb_visits_converted>2</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
 	</row>
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 8d82c019fcb6c67d9bb12ccbb15e86760da1730e..0281435f9a9b178e35cd04384f6668a76e6d3682 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
@@ -208,4 +208,17 @@
 		<segment>browserCode==IE;browserVersion==8.0</segment>
 		<logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
 	</row>
+	<row>
+		<label>Unknown</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>
+		<segment>browserCode==UNK;browserVersion==1.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
+	</row>
 </result>
\ No newline at end of file
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 34e9fb7630e5cf7a32f0b6994259e23673f0eec5..abee9660a2ff1e4ae3b9aeecd52f556c67fc1027 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
@@ -54,13 +54,13 @@
 	</row>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>4</nb_visits>
-		<nb_actions>4</nb_actions>
+		<nb_visits>5</nb_visits>
+		<nb_actions>5</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>4</bounce_count>
-		<nb_visits_converted>1</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<bounce_count>5</bounce_count>
+		<nb_visits_converted>2</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
 		<segment>browserCode==UNK</segment>
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 f330ccb30f05ecd306ecdfa41e56ebf254656ca0..bf235538d3d62b7258fe8503909b030c97fa6910 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
@@ -22,6 +22,17 @@
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
+	<row>
+		<label>Apple - iPhone</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>
+	</row>
 	<row>
 		<label>Samsung - GALAXY S5</label>
 		<nb_visits>1</nb_visits>
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 c7234f86067e9b7efc6c87733c4500dc0dbc2dcd..c6a73bb536258642c0f7cf945b5dcec156a08630 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
@@ -72,4 +72,16 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
 	</row>
+	<row>
+		<label>iOS</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/os/IOS.gif</logo>
+	</row>
 </result>
\ No newline at end of file
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 8ff1d6faeebf15bd75ccd8005f6e04bdfc1bc7f6..4d9ce1feaf08612b470ce95b0ea03f1b15b339c7 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
@@ -117,6 +117,19 @@
 		<segment>operatingSystemCode==BOT;operatingSystemVersion==UNK</segment>
 		<logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
 	</row>
+	<row>
+		<label>iOS 7.1</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>
+		<segment>operatingSystemCode==IOS;operatingSystemVersion==7.1</segment>
+		<logo>plugins/DevicesDetection/images/os/IOS.gif</logo>
+	</row>
 	<row>
 		<label>Mac</label>
 		<nb_visits>1</nb_visits>
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 875400f57895cbe5e94c6fc34d3f8d00c0a3849e..bca3a63823f5d408a3a33220a8ec32140bc77799 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
@@ -13,6 +13,19 @@
 		<segment>deviceType==desktop</segment>
 		<logo>plugins/DevicesDetection/images/screens/normal.gif</logo>
 	</row>
+	<row>
+		<label>Smartphone</label>
+		<nb_visits>4</nb_visits>
+		<nb_actions>6</nb_actions>
+		<max_actions>3</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>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<segment>deviceType==smartphone</segment>
+		<logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
+	</row>
 	<row>
 		<label>Unknown</label>
 		<nb_visits>4</nb_visits>
@@ -25,19 +38,6 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
 	</row>
-	<row>
-		<label>Smartphone</label>
-		<nb_visits>3</nb_visits>
-		<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>
-		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
-		<segment>deviceType==smartphone</segment>
-		<logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
-	</row>
 	<row>
 		<label>Camera</label>
 		<nb_visits>0</nb_visits>
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 d6f76b939eeb5b0149302e362fb6f39a713ddfee..b4efda313802d1819ab5e3324cdfc3c0655ec891 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>33</nb_conversions>
+		<nb_conversions>34</nb_conversions>
 	</row>
 	<row>
 		<label>1 day</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml
index d97c3eb0d0017c9e54acceaf589adf87e8acb285..603f6746151a1dc0035c7ffde9ca839533146e4b 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
-	<nb_conversions>34</nb_conversions>
-	<nb_visits_converted>34</nb_visits_converted>
-	<revenue>170</revenue>
-	<conversion_rate>89.47%</conversion_rate>
+	<nb_conversions>35</nb_conversions>
+	<nb_visits_converted>35</nb_visits_converted>
+	<revenue>175</revenue>
+	<conversion_rate>89.74%</conversion_rate>
 </result>
\ No newline at end of file
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 fcd1e7c56b36fe33f760c87422644d4e2262fdd9..c25b8275f08aebb7f7fa970ac4438504b41011a0 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>34</nb_conversions>
+		<nb_conversions>35</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 73154bb53f913631d5f98ca988bb220c2958c854..9c8f8990b0536bf6b8824fff21aff82b8322c62e 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
-	<nb_conversions>34</nb_conversions>
-	<nb_visits_converted>34</nb_visits_converted>
-	<revenue>170</revenue>
-	<conversion_rate>89.47%</conversion_rate>
-	<nb_conversions_new_visit>31</nb_conversions_new_visit>
-	<nb_visits_converted_new_visit>31</nb_visits_converted_new_visit>
-	<revenue_new_visit>155</revenue_new_visit>
-	<conversion_rate_new_visit>88.57%</conversion_rate_new_visit>
+	<nb_conversions>35</nb_conversions>
+	<nb_visits_converted>35</nb_visits_converted>
+	<revenue>175</revenue>
+	<conversion_rate>89.74%</conversion_rate>
+	<nb_conversions_new_visit>32</nb_conversions_new_visit>
+	<nb_visits_converted_new_visit>32</nb_visits_converted_new_visit>
+	<revenue_new_visit>160</revenue_new_visit>
+	<conversion_rate_new_visit>88.89%</conversion_rate_new_visit>
 	<nb_conversions_returning_visit>3</nb_conversions_returning_visit>
 	<nb_visits_converted_returning_visit>3</nb_visits_converted_returning_visit>
 	<revenue_returning_visit>15</revenue_returning_visit>
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 84ba4e506dcabcf297d6297ae1e8d3a8b8f3ed0b..129ac12421615e5e3a5803431a1c66c51f6f2d08 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
@@ -2114,7 +2114,7 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>67</idVisit>
+		<idVisit>68</idVisit>
 		<visitIp>173.5.0.0</visitIp>
 		
 		<actionDetails>
@@ -2123,7 +2123,7 @@
 				<goalName>all</goalName>
 				<goalId>1</goalId>
 				<revenue>5</revenue>
-				<goalPageId>93</goalPageId>
+				<goalPageId>94</goalPageId>
 				
 				<url>http://hello.example.com/hello/from/another/world/6,681965</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
@@ -2135,7 +2135,7 @@
 				<pageTitle />
 				<pageIdAction>61</pageIdAction>
 				
-				<pageId>93</pageId>
+				<pageId>94</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Generation Time</customVariablePageName1>
@@ -2293,7 +2293,7 @@
 				<pageTitle />
 				<pageIdAction>56</pageIdAction>
 				
-				<pageId>90</pageId>
+				<pageId>91</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Generation Time</customVariablePageName1>
@@ -2512,7 +2512,7 @@
 				<pageTitle>404/URL = http%3A%2F%2Fhello.example.com%2Fhello%2Fworld%2F6%2C681965</pageTitle>
 				<pageIdAction>60</pageIdAction>
 				
-				<pageId>92</pageId>
+				<pageId>93</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Generation Time</customVariablePageName1>
@@ -2638,7 +2638,7 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>66</idVisit>
+		<idVisit>67</idVisit>
 		<visitIp>70.95.32.0</visitIp>
 		
 		<actionDetails>
@@ -2647,7 +2647,7 @@
 				<goalName>all</goalName>
 				<goalId>1</goalId>
 				<revenue>5</revenue>
-				<goalPageId>91</goalPageId>
+				<goalPageId>92</goalPageId>
 				
 				<url>http://example.hello.com/Topic/hw43061</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
@@ -2659,7 +2659,7 @@
 				<pageTitle>301/URL = http%3A%2F%2Fexample.hello.com%2FTopic%2Fhw43061</pageTitle>
 				<pageIdAction>58</pageIdAction>
 				
-				<pageId>91</pageId>
+				<pageId>92</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName1>Generation Time</customVariablePageName1>
@@ -3130,6 +3130,115 @@
 		
 		
 		
+	</row>
+	<row>
+		<idSite>1</idSite>
+		<idVisit>66</idVisit>
+		<visitIp>73.77.55.45</visitIp>
+		
+		<actionDetails>
+			<row>
+				<type>goal</type>
+				<goalName>all</goalName>
+				<goalId>1</goalId>
+				<revenue>5</revenue>
+				<goalPageId>90</goalPageId>
+				
+				<url>http://piwik.net/api/fútbol-user-agent</url>
+				<icon>plugins/Morpheus/images/goal.png</icon>
+				
+			</row>
+			<row>
+				<type>action</type>
+				<url>http://piwik.net/api/fútbol-user-agent</url>
+				<pageTitle />
+				<pageIdAction>71</pageIdAction>
+				
+				<pageId>90</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<generationTime>0.009s</generationTime>
+				<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 />
+		<languageCode />
+		<language>Unknown</language>
+		<deviceType>Smartphone</deviceType>
+		<deviceTypeIcon>plugins/DevicesDetection/images/screens/smartphone.png</deviceTypeIcon>
+		<deviceBrand>Apple</deviceBrand>
+		<deviceModel>iPhone</deviceModel>
+		<operatingSystem>iOS 7.1</operatingSystem>
+		<operatingSystemName>iOS</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/IOS.gif</operatingSystemIcon>
+		<operatingSystemCode>IOS</operatingSystemCode>
+		<operatingSystemVersion>7.1</operatingSystemVersion>
+		<browserFamily />
+		<browserFamilyDescription>Unknown</browserFamilyDescription>
+		<browser>Unknown</browser>
+		<browserName>Unknown</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+		<browserCode>UNK</browserCode>
+		<browserVersion>1.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>New Jersey</region>
+		<regionCode>NJ</regionCode>
+		<city>Mount Laurel</city>
+		<location>Mount Laurel, New Jersey, United States</location>
+		<latitude>39.957001</latitude>
+		<longitude>-74.916000</longitude>
+		<visitLocalTime>12:20:31</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<customVariables>
+		</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 8485ac465cecc5099e1281ed39f4b3ba1a7c4fab..fd2d4e58ad4dcc5f42b3489e64984994703421e8 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>38</nb_visits>
-		<nb_actions>45</nb_actions>
-		<nb_pageviews>39</nb_pageviews>
-		<revenue>170</revenue>
+		<nb_visits>39</nb_visits>
+		<nb_actions>46</nb_actions>
+		<nb_pageviews>40</nb_pageviews>
+		<revenue>175</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 9b9cc1efd7945745fb0a0f637afe4efbc79fe907..5adcb351b840be3377e2e0d84beb0db3b86471ba 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>38</nb_visits>
-	<nb_actions>45</nb_actions>
+	<nb_visits>39</nb_visits>
+	<nb_actions>46</nb_actions>
 	<visits_evolution>100%</visits_evolution>
 	<actions_evolution>100%</actions_evolution>
 	<pageviews_evolution>100%</pageviews_evolution>
 	<revenue_evolution>100%</revenue_evolution>
-	<nb_pageviews>39</nb_pageviews>
-	<revenue>170</revenue>
+	<nb_pageviews>40</nb_pageviews>
+	<revenue>175</revenue>
 </result>
\ No newline at end of file
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 a1e8fd0e9d0eb5776943c8af2cf918b32f2dd998..cc8705fcdf1fe52d9c5f921283779138f024f75b 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
@@ -2,21 +2,21 @@
 <result>
 	<row>
 		<label>Direct Entry</label>
-		<nb_visits>34</nb_visits>
-		<nb_actions>39</nb_actions>
+		<nb_visits>35</nb_visits>
+		<nb_actions>40</nb_actions>
 		<max_actions>3</max_actions>
 		<sum_visit_length>549</sum_visit_length>
-		<bounce_count>30</bounce_count>
+		<bounce_count>31</bounce_count>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>30</nb_conversions>
-				<nb_visits_converted>30</nb_visits_converted>
-				<revenue>150</revenue>
+				<nb_conversions>31</nb_conversions>
+				<nb_visits_converted>31</nb_visits_converted>
+				<revenue>155</revenue>
 			</row>
 		</goals>
-		<nb_conversions>30</nb_conversions>
-		<revenue>150</revenue>
-		<sum_daily_nb_uniq_visitors>32</sum_daily_nb_uniq_visitors>
+		<nb_conversions>31</nb_conversions>
+		<revenue>155</revenue>
+		<sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>1</sum_daily_nb_users>
 		<nb_visits_converted>0</nb_visits_converted>
 	</row>
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 55471df8f7ff77eff206d8ee76a3a99c2751a173..3dd2c9e3c92f11c9749a477173e2f8d85d0d5dcf 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml
@@ -110,6 +110,17 @@
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
+	<row>
+		<label>iOS / Unknown / unknown</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>
+	</row>
 	<row>
 		<label>GNU/Linux / Chrome / unknown</label>
 		<nb_visits>1</nb_visits>
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 2dd3a3f0ff0df9842cf152638cf4c4f1a9bcf777..144514821ad14a3740cec1e8b0a8eacb16aa9df8 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>36</nb_visits>
-		<nb_actions>43</nb_actions>
+		<nb_visits>37</nb_visits>
+		<nb_actions>44</nb_actions>
 		<max_actions>3</max_actions>
 		<sum_visit_length>551</sum_visit_length>
-		<bounce_count>31</bounce_count>
-		<nb_visits_converted>32</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>34</sum_daily_nb_uniq_visitors>
+		<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>
 		<segment>resolution==unknown</segment>
 	</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 fa5433509b3a765ed143c95ad306fc29b729be11..226496376bda7f5a0e0b608709ceec93b94f4369 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
@@ -83,6 +83,34 @@
 		<region_name>Nunavut</region_name>
 		<logo>plugins/UserCountry/images/flags/ca.png</logo>
 	</row>
+	<row>
+		<label>Mount Laurel, New Jersey, United States</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>
+		<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>
+		<lat>39.957</lat>
+		<long>-74.916</long>
+		<segment>city==Mount+Laurel;regionCode==NJ;countryCode==us</segment>
+		<city_name>Mount Laurel</city_name>
+		<region>NJ</region>
+		<country>us</country>
+		<country_name>United States</country_name>
+		<region_name>New Jersey</region_name>
+		<logo>plugins/UserCountry/images/flags/us.png</logo>
+	</row>
 	<row>
 		<label>Seoul, Seoul-t&amp;#039;ukpyolsi, South Korea</label>
 		<nb_visits>1</nb_visits>
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 054cf2e1d3d81dabf2dc9754a2f518db78d80268..7d0fe7440f3f1a1cb9080d8cbbb3cef684aaf575 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
@@ -22,21 +22,21 @@
 	</row>
 	<row>
 		<label>North America</label>
-		<nb_visits>11</nb_visits>
-		<nb_actions>14</nb_actions>
+		<nb_visits>12</nb_visits>
+		<nb_actions>15</nb_actions>
 		<max_actions>3</max_actions>
 		<sum_visit_length>4</sum_visit_length>
-		<bounce_count>9</bounce_count>
+		<bounce_count>10</bounce_count>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>11</nb_conversions>
-				<nb_visits_converted>11</nb_visits_converted>
-				<revenue>55</revenue>
+				<nb_conversions>12</nb_conversions>
+				<nb_visits_converted>12</nb_visits_converted>
+				<revenue>60</revenue>
 			</row>
 		</goals>
-		<nb_conversions>11</nb_conversions>
-		<revenue>55</revenue>
-		<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+		<nb_conversions>12</nb_conversions>
+		<revenue>60</revenue>
+		<sum_daily_nb_uniq_visitors>10</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 98deda9945e0b57ac0affcb80e49731b9e4d03de..d53fee5f756c8926887e3ff1d6b7ee5aef538984 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
@@ -24,6 +24,30 @@
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
+	<row>
+		<label>United States</label>
+		<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>11</nb_conversions>
+				<nb_visits_converted>11</nb_visits_converted>
+				<revenue>55</revenue>
+			</row>
+		</goals>
+		<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>us</code>
+		<logo>plugins/UserCountry/images/flags/us.png</logo>
+		<segment>countryCode==us</segment>
+		<logoWidth>16</logoWidth>
+		<logoHeight>11</logoHeight>
+	</row>
 	<row>
 		<label>Unknown</label>
 		<nb_visits>11</nb_visits>
@@ -49,30 +73,6 @@
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
-	<row>
-		<label>United States</label>
-		<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>10</nb_conversions>
-				<nb_visits_converted>10</nb_visits_converted>
-				<revenue>50</revenue>
-			</row>
-		</goals>
-		<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>
-		<segment>countryCode==us</segment>
-		<logoWidth>16</logoWidth>
-		<logoHeight>11</logoHeight>
-	</row>
 	<row>
 		<label>Brazil</label>
 		<nb_visits>3</nb_visits>
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 bdcfaeca3c2b9114de98d1e60005933232d98b91..a52c35ea1c3e83b148225bfc6b4984da15a189bb 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
@@ -50,6 +50,31 @@
 		<region_name>Virginia</region_name>
 		<logo>plugins/UserCountry/images/flags/us.png</logo>
 	</row>
+	<row>
+		<label>New Jersey, United States</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>
+		<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>
+		<segment>regionCode==NJ;countryCode==us</segment>
+		<region>NJ</region>
+		<country>us</country>
+		<country_name>United States</country_name>
+		<region_name>New Jersey</region_name>
+		<logo>plugins/UserCountry/images/flags/us.png</logo>
+	</row>
 	<row>
 		<label>Nunavut, Canada</label>
 		<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml
index da22c13a835d69fe2d94a5b649dfa1cf4d638001..d0fd6382b64d46ffade948333fe70072ec7c33ee 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml
@@ -2,13 +2,13 @@
 <result>
 	<row>
 		<label>Unknown (xx)</label>
-		<nb_visits>38</nb_visits>
-		<nb_actions>45</nb_actions>
+		<nb_visits>39</nb_visits>
+		<nb_actions>46</nb_actions>
 		<max_actions>3</max_actions>
 		<sum_visit_length>551</sum_visit_length>
-		<bounce_count>33</bounce_count>
-		<nb_visits_converted>34</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>36</sum_daily_nb_uniq_visitors>
+		<bounce_count>34</bounce_count>
+		<nb_visits_converted>35</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>37</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>2</sum_daily_nb_users>
 		<segment>languageCode==xx</segment>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml
index d2c34aab1aa5604dd51e6100ae8323a62ff9963c..af32b492d42be9f43a2691dfff90d7a3df0bdde8 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml
@@ -2,13 +2,13 @@
 <result>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>38</nb_visits>
-		<nb_actions>45</nb_actions>
+		<nb_visits>39</nb_visits>
+		<nb_actions>46</nb_actions>
 		<max_actions>3</max_actions>
 		<sum_visit_length>551</sum_visit_length>
-		<bounce_count>33</bounce_count>
-		<nb_visits_converted>34</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>36</sum_daily_nb_uniq_visitors>
+		<bounce_count>34</bounce_count>
+		<nb_visits_converted>35</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>37</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>2</sum_daily_nb_users>
 		<segment>languageCode==xx</segment>
 	</row>
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 b381de56d649df2b144aa1a742cb745af2ee956e..5a68e65309fc4995a37ba0c4524c914006767aa4 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
@@ -2,13 +2,13 @@
 <result>
 	<row>
 		<label>Monday</label>
-		<nb_visits>1</nb_visits>
-		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_actions>1</nb_actions>
+		<nb_visits>2</nb_visits>
+		<nb_uniq_visitors>2</nb_uniq_visitors>
+		<nb_actions>2</nb_actions>
 		<nb_users>0</nb_users>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>1</bounce_count>
-		<nb_visits_converted>1</nb_visits_converted>
+		<bounce_count>2</bounce_count>
+		<nb_visits_converted>2</nb_visits_converted>
 		<day_of_week>1</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 e4f045cd9f842fe0d47d4c2700c0a9e5ba1f64a0..41f21c2e6af8b5c5902be601ae55ab3b4d4e6c62 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
@@ -146,13 +146,13 @@
 	</row>
 	<row>
 		<label>12h</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
+		<nb_visits>3</nb_visits>
+		<nb_actions>3</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>2</bounce_count>
-		<nb_visits_converted>2</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<bounce_count>3</bounce_count>
+		<nb_visits_converted>3</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<segment>visitLocalHour==12</segment>
 	</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 fcc08ecee4caa54b5edf7ab52961e31b075221b9..66c22ba1a6d607da94b770c91bbf09650c069ef5 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
@@ -191,23 +191,23 @@
 	</row>
 	<row>
 		<label>12h</label>
-		<nb_visits>1</nb_visits>
-		<nb_actions>1</nb_actions>
+		<nb_visits>2</nb_visits>
+		<nb_actions>2</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>1</bounce_count>
+		<bounce_count>2</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>1</nb_conversions>
-				<nb_visits_converted>1</nb_visits_converted>
-				<revenue>5</revenue>
+				<nb_conversions>2</nb_conversions>
+				<nb_visits_converted>2</nb_visits_converted>
+				<revenue>10</revenue>
 			</row>
 		</goals>
-		<nb_conversions>1</nb_conversions>
-		<revenue>5</revenue>
+		<nb_conversions>2</nb_conversions>
+		<revenue>10</revenue>
 		<segment>visitServerHour==12</segment>
 	</row>
 	<row>
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 43027f77b01cabd41894fdba1b772872b932611e..c39484f83daf7bb60cc4453b6467c9a343f00e41 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
@@ -2,7 +2,7 @@
 <result>
 	<row>
 		<label>New visits</label>
-		<nb_visits>35</nb_visits>
+		<nb_visits>36</nb_visits>
 	</row>
 	<row>
 		<label>0 days</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 a879d261b3f9c45197eacdfa628ca607e1280cea..adb58e2a56dafe112582bbd3b5081e4de796ab54 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
@@ -2,7 +2,7 @@
 <result>
 	<row>
 		<label>New visits</label>
-		<nb_visits>39</nb_visits>
+		<nb_visits>40</nb_visits>
 	</row>
 	<row>
 		<label>0 days</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 221a29c2b50747d755f896fbad8f64c397b1ad6b..4eb8fddf6540b09be85e040dab6f135da5df337d 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>38</nb_visits>
+		<nb_visits>39</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 11fd85a144e14da330b9012d468b90fec02fbb54..f02d54dcf50bf813109ca20ce304ac9b44ce8776 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>44</nb_visits>
-		<nb_visits_percentage>86%</nb_visits_percentage>
+		<nb_visits>45</nb_visits>
+		<nb_visits_percentage>87%</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 0ca3284b5b90ebd274acce799c3d87ad6bfbce07..174a8d90d0685e2b99f3dbebd2293494a931f253 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>33</nb_visits>
+		<nb_visits>34</nb_visits>
 	</row>
 	<row>
 		<label>2 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 51ed7da2eb81af49e4d9cc3f31287f438d884535..d771a07bc9b8ecaa69171fd5a36ce98583b4ec30 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>42</nb_visits>
+		<nb_visits>43</nb_visits>
 	</row>
 	<row>
 		<label>2 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 f3e2effb18aae0989254d008fb5ea64ea1988502..5809c92de9012546ac7ea714a3f89729d80759ca 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>35</nb_visits>
+		<nb_visits>36</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 b62b79979b0ac4c0ccd05d1c70e11e884f094d8b..6f5a23aa2a6814e204530b9d1fc00f55ca3f367b 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>45</nb_visits>
+		<nb_visits>46</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 05473b60f6d7494e9b2ac79af579bb3a877ed99e..0e7e4e3d09acd87fee84b679b962e412779dfd0c 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>45</result>
\ No newline at end of file
+<result>46</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 95aa700980ff79932259dbf63a2ada418cf165b8..5c61a821373deec98f78930e39ce94f861fa30e2 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>33</result>
\ No newline at end of file
+<result>34</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 8af80c337fce212214b9dcfe62d5beb85a63d248..51a0bb84729fdb92da5bb75688557a9e186f4c1d 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>36</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.getVisitsConverted_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
index 5c61a821373deec98f78930e39ce94f861fa30e2..8e4b837a6265c3a8607e7c11d3e4f394488f9fce 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>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.getVisits_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
index 962fbe983a7375f1b4809fc754f60711606c4f28..f24432d1a4c6e343519ab3c4a9e5e8687a0fc805 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>38</result>
\ No newline at end of file
+<result>39</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 a71746a977d7cb65e3f8262eb0863404ab8dd3d8..6f682232bc92203ede02e24d8dc30d7ca2549205 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>36</nb_uniq_visitors>
+	<nb_uniq_visitors>37</nb_uniq_visitors>
 	<nb_users>2</nb_users>
-	<nb_visits>38</nb_visits>
-	<nb_actions>45</nb_actions>
-	<nb_visits_converted>34</nb_visits_converted>
-	<bounce_count>33</bounce_count>
+	<nb_visits>39</nb_visits>
+	<nb_actions>46</nb_actions>
+	<nb_visits_converted>35</nb_visits_converted>
+	<bounce_count>34</bounce_count>
 	<sum_visit_length>551</sum_visit_length>
 	<max_actions>3</max_actions>
 	<bounce_rate>87%</bounce_rate>
 	<nb_actions_per_visit>1.2</nb_actions_per_visit>
-	<avg_time_on_site>15</avg_time_on_site>
+	<avg_time_on_site>14</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 4e4c5a220b9997563c8967db554377b6bc950ea8..94b54bf27a6b2ec2e78f92534404fcff433f576e 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>38</nb_visits>
-			<nb_actions>45</nb_actions>
-			<nb_pageviews>39</nb_pageviews>
-			<revenue>170</revenue>
-			<nb_conversions>34</nb_conversions>
+			<nb_visits>39</nb_visits>
+			<nb_actions>46</nb_actions>
+			<nb_pageviews>40</nb_pageviews>
+			<revenue>175</revenue>
+			<nb_conversions>35</nb_conversions>
 			<visits_evolution>100%</visits_evolution>
 			<actions_evolution>100%</actions_evolution>
 			<pageviews_evolution>100%</pageviews_evolution>
@@ -59,8 +59,8 @@
 			<revenue>5</revenue>
 			<nb_conversions>1</nb_conversions>
 			<visits_evolution>-97.4%</visits_evolution>
-			<actions_evolution>-77.8%</actions_evolution>
-			<pageviews_evolution>-74.4%</pageviews_evolution>
+			<actions_evolution>-78.3%</actions_evolution>
+			<pageviews_evolution>-75%</pageviews_evolution>
 			<revenue_evolution>-97.1%</revenue_evolution>
 			<nb_conversions_evolution>-97.1%</nb_conversions_evolution>
 			<idsite>1</idsite>
diff --git a/tests/resources/access-logs/fake_logs_nginx_json.log b/tests/resources/access-logs/fake_logs_nginx_json.log
index 4cf39dfbb0d3ad5e50a44870cfd008a15cbacd0f..29d183086df11b0b726fb1b3d607875d6b7da5b1 100644
--- a/tests/resources/access-logs/fake_logs_nginx_json.log
+++ b/tests/resources/access-logs/fake_logs_nginx_json.log
@@ -1 +1,2 @@
-{"ip": "72.45.67.32","host": "piwik.net","path": "/","status": "200","referrer": "https://www.test.nl/","user_agent": "Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36","length": 915,"generation_time_milli": 0.001,"date": "2012-08-13T13:20:31+01:00"}
\ No newline at end of file
+{"ip": "72.45.67.32","host": "piwik.net","path": "/","status": "200","referrer": "https://www.test.nl/","user_agent": "Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36","length": 915,"generation_time_milli": 0.001,"date": "2012-08-13T13:20:31+01:00"}
+{"ip": "73.77.55.45","host": "piwik.net","path": "/api/f\xFAtbol-user-agent","status": "200","referrer": "-","user_agent": "F\xFAtbol/1.0 (iPhone; iOS 7.1; Scale/2.00)","length": 267,"generation_time_milli": 0.009,"date": "2012-08-13T13:20:31+01:00"}
\ No newline at end of file