Merge pull request #7452 from piwik/7388

Fix Sort filters are sometimes applied multiple times

18 files changed, 327 insertions, 327 deletions

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 7ebd0835aa..9daee7778d 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
@@ -39,16 +39,16 @@
 		<logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
 	</row>
 	<row>
-		<label>Tablet</label>
+		<label>Camera</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==tablet</segment>
-		<logo>plugins/DevicesDetection/images/screens/tablet.png</logo>
+		<segment>deviceType==camera</segment>
+		<logo>plugins/DevicesDetection/images/screens/camera.png</logo>
 	</row>
 	<row>
-		<label>Feature phone</label>
+		<label>Car browser</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==feature+phone</segment>
-		<logo>plugins/DevicesDetection/images/screens/mobile.gif</logo>
+		<segment>deviceType==car+browser</segment>
+		<logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo>
 	</row>
 	<row>
 		<label>Console</label>
@@ -57,16 +57,16 @@
 		<logo>plugins/DevicesDetection/images/screens/console.gif</logo>
 	</row>
 	<row>
-		<label>Tv</label>
+		<label>Feature phone</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==tv</segment>
-		<logo>plugins/DevicesDetection/images/screens/tv.png</logo>
+		<segment>deviceType==feature+phone</segment>
+		<logo>plugins/DevicesDetection/images/screens/mobile.gif</logo>
 	</row>
 	<row>
-		<label>Car browser</label>
+		<label>Portable media player</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==car+browser</segment>
-		<logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo>
+		<segment>deviceType==portable+media+player</segment>
+		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
 	</row>
 	<row>
 		<label>Smart display</label>
@@ -75,15 +75,15 @@
 		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
 	</row>
 	<row>
-		<label>Camera</label>
+		<label>Tablet</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==camera</segment>
-		<logo>plugins/DevicesDetection/images/screens/camera.png</logo>
+		<segment>deviceType==tablet</segment>
+		<logo>plugins/DevicesDetection/images/screens/tablet.png</logo>
 	</row>
 	<row>
-		<label>Portable media player</label>
+		<label>Tv</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==portable+media+player</segment>
-		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
+		<segment>deviceType==tv</segment>
+		<logo>plugins/DevicesDetection/images/screens/tv.png</logo>
 	</row>
 </result>
\ No newline at end of file
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 13a7188162..14bb86a968 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
@@ -21,6 +21,26 @@
 		<code>Asia</code>
 	</row>
 	<row>
+		<label>North America</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>North America</code>
+	</row>
+	<row>
 		<label>Unknown</label>
 		<nb_visits>11</nb_visits>
 		<nb_actions>12</nb_actions>
@@ -42,26 +62,6 @@
 		<code>Unknown</code>
 	</row>
 	<row>
-		<label>North America</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>North America</code>
-	</row>
-	<row>
 		<label>South America</label>
 		<nb_visits>3</nb_visits>
 		<nb_actions>3</nb_actions>
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 7ebd0835aa..9daee7778d 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
@@ -39,16 +39,16 @@
 		<logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
 	</row>
 	<row>
-		<label>Tablet</label>
+		<label>Camera</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==tablet</segment>
-		<logo>plugins/DevicesDetection/images/screens/tablet.png</logo>
+		<segment>deviceType==camera</segment>
+		<logo>plugins/DevicesDetection/images/screens/camera.png</logo>
 	</row>
 	<row>
-		<label>Feature phone</label>
+		<label>Car browser</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==feature+phone</segment>
-		<logo>plugins/DevicesDetection/images/screens/mobile.gif</logo>
+		<segment>deviceType==car+browser</segment>
+		<logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo>
 	</row>
 	<row>
 		<label>Console</label>
@@ -57,16 +57,16 @@
 		<logo>plugins/DevicesDetection/images/screens/console.gif</logo>
 	</row>
 	<row>
-		<label>Tv</label>
+		<label>Feature phone</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==tv</segment>
-		<logo>plugins/DevicesDetection/images/screens/tv.png</logo>
+		<segment>deviceType==feature+phone</segment>
+		<logo>plugins/DevicesDetection/images/screens/mobile.gif</logo>
 	</row>
 	<row>
-		<label>Car browser</label>
+		<label>Portable media player</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==car+browser</segment>
-		<logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo>
+		<segment>deviceType==portable+media+player</segment>
+		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
 	</row>
 	<row>
 		<label>Smart display</label>
@@ -75,15 +75,15 @@
 		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
 	</row>
 	<row>
-		<label>Camera</label>
+		<label>Tablet</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==camera</segment>
-		<logo>plugins/DevicesDetection/images/screens/camera.png</logo>
+		<segment>deviceType==tablet</segment>
+		<logo>plugins/DevicesDetection/images/screens/tablet.png</logo>
 	</row>
 	<row>
-		<label>Portable media player</label>
+		<label>Tv</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==portable+media+player</segment>
-		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
+		<segment>deviceType==tv</segment>
+		<logo>plugins/DevicesDetection/images/screens/tv.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
index 4526378f9b..c905bbb316 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
@@ -257,10 +257,10 @@
 		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 	</row>
 	<row>
-		<label>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</label>
+		<label>Stratford-upon-Avon, Kent, United Kingdom</label>
 		<nb_visits>2</nb_visits>
-		<nb_actions>3</nb_actions>
-		<max_actions>2</max_actions>
+		<nb_actions>4</nb_actions>
+		<max_actions>3</max_actions>
 		<sum_visit_length>1261</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<goals>
@@ -279,16 +279,16 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<segment>city==Stratford-upon-Avon;regionCode==66;countryCode==mk</segment>
+		<segment>city==Stratford-upon-Avon;regionCode==G5;countryCode==gb</segment>
 		<city_name>Stratford-upon-Avon</city_name>
-		<region>66</region>
-		<country>mk</country>
-		<country_name>Macedonia, the Former Yugoslav Republic of</country_name>
-		<region_name>Miravci</region_name>
-		<logo>plugins/UserCountry/images/flags/mk.png</logo>
+		<region>G5</region>
+		<country>gb</country>
+		<country_name>United Kingdom</country_name>
+		<region_name>Kent</region_name>
+		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 	</row>
 	<row>
-		<label>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</label>
+		<label>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</label>
 		<nb_visits>2</nb_visits>
 		<nb_actions>3</nb_actions>
 		<max_actions>2</max_actions>
@@ -310,19 +310,19 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<segment>city==Stratford-upon-Avon;regionCode==66;countryCode==ru</segment>
+		<segment>city==Stratford-upon-Avon;regionCode==66;countryCode==mk</segment>
 		<city_name>Stratford-upon-Avon</city_name>
 		<region>66</region>
-		<country>ru</country>
-		<country_name>Russian Federation</country_name>
-		<region_name>Saint Petersburg City</region_name>
-		<logo>plugins/UserCountry/images/flags/ru.png</logo>
+		<country>mk</country>
+		<country_name>Macedonia, the Former Yugoslav Republic of</country_name>
+		<region_name>Miravci</region_name>
+		<logo>plugins/UserCountry/images/flags/mk.png</logo>
 	</row>
 	<row>
-		<label>Stratford-upon-Avon, Kent, United Kingdom</label>
+		<label>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</label>
 		<nb_visits>2</nb_visits>
-		<nb_actions>4</nb_actions>
-		<max_actions>3</max_actions>
+		<nb_actions>3</nb_actions>
+		<max_actions>2</max_actions>
 		<sum_visit_length>1261</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<goals>
@@ -341,13 +341,13 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<segment>city==Stratford-upon-Avon;regionCode==G5;countryCode==gb</segment>
+		<segment>city==Stratford-upon-Avon;regionCode==66;countryCode==ru</segment>
 		<city_name>Stratford-upon-Avon</city_name>
-		<region>G5</region>
-		<country>gb</country>
-		<country_name>United Kingdom</country_name>
-		<region_name>Kent</region_name>
-		<logo>plugins/UserCountry/images/flags/gb.png</logo>
+		<region>66</region>
+		<country>ru</country>
+		<country_name>Russian Federation</country_name>
+		<region_name>Saint Petersburg City</region_name>
+		<logo>plugins/UserCountry/images/flags/ru.png</logo>
 	</row>
 	<row>
 		<label>not a city, California, United States</label>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
index 3f66e47721..5332bb5366 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
@@ -120,10 +120,10 @@
 		<logo>plugins/UserCountry/images/flags/ru.png</logo>
 	</row>
 	<row>
-		<label>Unknown, Tibet</label>
+		<label>Franche-Comte, France</label>
 		<nb_visits>2</nb_visits>
-		<nb_actions>3</nb_actions>
-		<max_actions>2</max_actions>
+		<nb_actions>4</nb_actions>
+		<max_actions>3</max_actions>
 		<sum_visit_length>1261</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<goals>
@@ -142,18 +142,18 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<segment>regionCode==1;countryCode==ti</segment>
-		<region>1</region>
-		<country>ti</country>
-		<country_name>Tibet</country_name>
-		<region_name>Unknown</region_name>
-		<logo>plugins/UserCountry/images/flags/ti.png</logo>
+		<segment>regionCode==A6;countryCode==fr</segment>
+		<region>A6</region>
+		<country>fr</country>
+		<country_name>France</country_name>
+		<region_name>Franche-Comte</region_name>
+		<logo>plugins/UserCountry/images/flags/fr.png</logo>
 	</row>
 	<row>
-		<label>Miravci, Macedonia, the Former Yugoslav Republic of</label>
+		<label>Kent, United Kingdom</label>
 		<nb_visits>2</nb_visits>
-		<nb_actions>3</nb_actions>
-		<max_actions>2</max_actions>
+		<nb_actions>4</nb_actions>
+		<max_actions>3</max_actions>
 		<sum_visit_length>1261</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<goals>
@@ -172,18 +172,18 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<segment>regionCode==66;countryCode==mk</segment>
-		<region>66</region>
-		<country>mk</country>
-		<country_name>Macedonia, the Former Yugoslav Republic of</country_name>
-		<region_name>Miravci</region_name>
-		<logo>plugins/UserCountry/images/flags/mk.png</logo>
+		<segment>regionCode==G5;countryCode==gb</segment>
+		<region>G5</region>
+		<country>gb</country>
+		<country_name>United Kingdom</country_name>
+		<region_name>Kent</region_name>
+		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 	</row>
 	<row>
-		<label>Franche-Comte, France</label>
+		<label>London, City of, United Kingdom</label>
 		<nb_visits>2</nb_visits>
-		<nb_actions>4</nb_actions>
-		<max_actions>3</max_actions>
+		<nb_actions>3</nb_actions>
+		<max_actions>2</max_actions>
 		<sum_visit_length>1261</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<goals>
@@ -202,18 +202,18 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<segment>regionCode==A6;countryCode==fr</segment>
-		<region>A6</region>
-		<country>fr</country>
-		<country_name>France</country_name>
-		<region_name>Franche-Comte</region_name>
-		<logo>plugins/UserCountry/images/flags/fr.png</logo>
+		<segment>regionCode==H9;countryCode==gb</segment>
+		<region>H9</region>
+		<country>gb</country>
+		<country_name>United Kingdom</country_name>
+		<region_name>London, City of</region_name>
+		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 	</row>
 	<row>
-		<label>Kent, United Kingdom</label>
+		<label>Miravci, Macedonia, the Former Yugoslav Republic of</label>
 		<nb_visits>2</nb_visits>
-		<nb_actions>4</nb_actions>
-		<max_actions>3</max_actions>
+		<nb_actions>3</nb_actions>
+		<max_actions>2</max_actions>
 		<sum_visit_length>1261</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<goals>
@@ -232,15 +232,15 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<segment>regionCode==G5;countryCode==gb</segment>
-		<region>G5</region>
-		<country>gb</country>
-		<country_name>United Kingdom</country_name>
-		<region_name>Kent</region_name>
-		<logo>plugins/UserCountry/images/flags/gb.png</logo>
+		<segment>regionCode==66;countryCode==mk</segment>
+		<region>66</region>
+		<country>mk</country>
+		<country_name>Macedonia, the Former Yugoslav Republic of</country_name>
+		<region_name>Miravci</region_name>
+		<logo>plugins/UserCountry/images/flags/mk.png</logo>
 	</row>
 	<row>
-		<label>London, City of, United Kingdom</label>
+		<label>Unknown, Tibet</label>
 		<nb_visits>2</nb_visits>
 		<nb_actions>3</nb_actions>
 		<max_actions>2</max_actions>
@@ -262,12 +262,12 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<segment>regionCode==H9;countryCode==gb</segment>
-		<region>H9</region>
-		<country>gb</country>
-		<country_name>United Kingdom</country_name>
-		<region_name>London, City of</region_name>
-		<logo>plugins/UserCountry/images/flags/gb.png</logo>
+		<segment>regionCode==1;countryCode==ti</segment>
+		<region>1</region>
+		<country>ti</country>
+		<country_name>Tibet</country_name>
+		<region_name>Unknown</region_name>
+		<logo>plugins/UserCountry/images/flags/ti.png</logo>
 	</row>
 	<row>
 		<label>California, United States</label>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml
index 2607acf076..3f2929faff 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml
@@ -13,22 +13,16 @@
 		<logo>plugins/DevicesDetection/images/screens/normal.gif</logo>
 	</row>
 	<row>
-		<label>Smartphone</label>
-		<nb_visits>0</nb_visits>
-		<segment>deviceType==smartphone</segment>
-		<logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
-	</row>
-	<row>
-		<label>Tablet</label>
+		<label>Camera</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==tablet</segment>
-		<logo>plugins/DevicesDetection/images/screens/tablet.png</logo>
+		<segment>deviceType==camera</segment>
+		<logo>plugins/DevicesDetection/images/screens/camera.png</logo>
 	</row>
 	<row>
-		<label>Feature phone</label>
+		<label>Car browser</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==feature+phone</segment>
-		<logo>plugins/DevicesDetection/images/screens/mobile.gif</logo>
+		<segment>deviceType==car+browser</segment>
+		<logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo>
 	</row>
 	<row>
 		<label>Console</label>
@@ -37,16 +31,16 @@
 		<logo>plugins/DevicesDetection/images/screens/console.gif</logo>
 	</row>
 	<row>
-		<label>Tv</label>
+		<label>Feature phone</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==tv</segment>
-		<logo>plugins/DevicesDetection/images/screens/tv.png</logo>
+		<segment>deviceType==feature+phone</segment>
+		<logo>plugins/DevicesDetection/images/screens/mobile.gif</logo>
 	</row>
 	<row>
-		<label>Car browser</label>
+		<label>Portable media player</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==car+browser</segment>
-		<logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo>
+		<segment>deviceType==portable+media+player</segment>
+		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
 	</row>
 	<row>
 		<label>Smart display</label>
@@ -55,15 +49,21 @@
 		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
 	</row>
 	<row>
-		<label>Camera</label>
+		<label>Smartphone</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==camera</segment>
-		<logo>plugins/DevicesDetection/images/screens/camera.png</logo>
+		<segment>deviceType==smartphone</segment>
+		<logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
 	</row>
 	<row>
-		<label>Portable media player</label>
+		<label>Tablet</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==portable+media+player</segment>
-		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
+		<segment>deviceType==tablet</segment>
+		<logo>plugins/DevicesDetection/images/screens/tablet.png</logo>
+	</row>
+	<row>
+		<label>Tv</label>
+		<nb_visits>0</nb_visits>
+		<segment>deviceType==tv</segment>
+		<logo>plugins/DevicesDetection/images/screens/tv.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml
index 2607acf076..3f2929faff 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml
@@ -13,22 +13,16 @@
 		<logo>plugins/DevicesDetection/images/screens/normal.gif</logo>
 	</row>
 	<row>
-		<label>Smartphone</label>
-		<nb_visits>0</nb_visits>
-		<segment>deviceType==smartphone</segment>
-		<logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
-	</row>
-	<row>
-		<label>Tablet</label>
+		<label>Camera</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==tablet</segment>
-		<logo>plugins/DevicesDetection/images/screens/tablet.png</logo>
+		<segment>deviceType==camera</segment>
+		<logo>plugins/DevicesDetection/images/screens/camera.png</logo>
 	</row>
 	<row>
-		<label>Feature phone</label>
+		<label>Car browser</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==feature+phone</segment>
-		<logo>plugins/DevicesDetection/images/screens/mobile.gif</logo>
+		<segment>deviceType==car+browser</segment>
+		<logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo>
 	</row>
 	<row>
 		<label>Console</label>
@@ -37,16 +31,16 @@
 		<logo>plugins/DevicesDetection/images/screens/console.gif</logo>
 	</row>
 	<row>
-		<label>Tv</label>
+		<label>Feature phone</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==tv</segment>
-		<logo>plugins/DevicesDetection/images/screens/tv.png</logo>
+		<segment>deviceType==feature+phone</segment>
+		<logo>plugins/DevicesDetection/images/screens/mobile.gif</logo>
 	</row>
 	<row>
-		<label>Car browser</label>
+		<label>Portable media player</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==car+browser</segment>
-		<logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo>
+		<segment>deviceType==portable+media+player</segment>
+		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
 	</row>
 	<row>
 		<label>Smart display</label>
@@ -55,15 +49,21 @@
 		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
 	</row>
 	<row>
-		<label>Camera</label>
+		<label>Smartphone</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==camera</segment>
-		<logo>plugins/DevicesDetection/images/screens/camera.png</logo>
+		<segment>deviceType==smartphone</segment>
+		<logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
 	</row>
 	<row>
-		<label>Portable media player</label>
+		<label>Tablet</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==portable+media+player</segment>
-		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
+		<segment>deviceType==tablet</segment>
+		<logo>plugins/DevicesDetection/images/screens/tablet.png</logo>
+	</row>
+	<row>
+		<label>Tv</label>
+		<nb_visits>0</nb_visits>
+		<segment>deviceType==tv</segment>
+		<logo>plugins/DevicesDetection/images/screens/tv.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml
index d52006abf9..31bbd93f01 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml
@@ -14,22 +14,16 @@
 		<logo>plugins/DevicesDetection/images/screens/normal.gif</logo>
 	</row>
 	<row>
-		<label>Smartphone</label>
-		<nb_visits>0</nb_visits>
-		<segment>deviceType==smartphone</segment>
-		<logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
-	</row>
-	<row>
-		<label>Tablet</label>
+		<label>Camera</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==tablet</segment>
-		<logo>plugins/DevicesDetection/images/screens/tablet.png</logo>
+		<segment>deviceType==camera</segment>
+		<logo>plugins/DevicesDetection/images/screens/camera.png</logo>
 	</row>
 	<row>
-		<label>Feature phone</label>
+		<label>Car browser</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==feature+phone</segment>
-		<logo>plugins/DevicesDetection/images/screens/mobile.gif</logo>
+		<segment>deviceType==car+browser</segment>
+		<logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo>
 	</row>
 	<row>
 		<label>Console</label>
@@ -38,16 +32,16 @@
 		<logo>plugins/DevicesDetection/images/screens/console.gif</logo>
 	</row>
 	<row>
-		<label>Tv</label>
+		<label>Feature phone</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==tv</segment>
-		<logo>plugins/DevicesDetection/images/screens/tv.png</logo>
+		<segment>deviceType==feature+phone</segment>
+		<logo>plugins/DevicesDetection/images/screens/mobile.gif</logo>
 	</row>
 	<row>
-		<label>Car browser</label>
+		<label>Portable media player</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==car+browser</segment>
-		<logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo>
+		<segment>deviceType==portable+media+player</segment>
+		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
 	</row>
 	<row>
 		<label>Smart display</label>
@@ -56,15 +50,21 @@
 		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
 	</row>
 	<row>
-		<label>Camera</label>
+		<label>Smartphone</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==camera</segment>
-		<logo>plugins/DevicesDetection/images/screens/camera.png</logo>
+		<segment>deviceType==smartphone</segment>
+		<logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
 	</row>
 	<row>
-		<label>Portable media player</label>
+		<label>Tablet</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==portable+media+player</segment>
-		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
+		<segment>deviceType==tablet</segment>
+		<logo>plugins/DevicesDetection/images/screens/tablet.png</logo>
+	</row>
+	<row>
+		<label>Tv</label>
+		<nb_visits>0</nb_visits>
+		<segment>deviceType==tv</segment>
+		<logo>plugins/DevicesDetection/images/screens/tv.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml
index d52006abf9..31bbd93f01 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml
@@ -14,22 +14,16 @@
 		<logo>plugins/DevicesDetection/images/screens/normal.gif</logo>
 	</row>
 	<row>
-		<label>Smartphone</label>
-		<nb_visits>0</nb_visits>
-		<segment>deviceType==smartphone</segment>
-		<logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
-	</row>
-	<row>
-		<label>Tablet</label>
+		<label>Camera</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==tablet</segment>
-		<logo>plugins/DevicesDetection/images/screens/tablet.png</logo>
+		<segment>deviceType==camera</segment>
+		<logo>plugins/DevicesDetection/images/screens/camera.png</logo>
 	</row>
 	<row>
-		<label>Feature phone</label>
+		<label>Car browser</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==feature+phone</segment>
-		<logo>plugins/DevicesDetection/images/screens/mobile.gif</logo>
+		<segment>deviceType==car+browser</segment>
+		<logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo>
 	</row>
 	<row>
 		<label>Console</label>
@@ -38,16 +32,16 @@
 		<logo>plugins/DevicesDetection/images/screens/console.gif</logo>
 	</row>
 	<row>
-		<label>Tv</label>
+		<label>Feature phone</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==tv</segment>
-		<logo>plugins/DevicesDetection/images/screens/tv.png</logo>
+		<segment>deviceType==feature+phone</segment>
+		<logo>plugins/DevicesDetection/images/screens/mobile.gif</logo>
 	</row>
 	<row>
-		<label>Car browser</label>
+		<label>Portable media player</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==car+browser</segment>
-		<logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo>
+		<segment>deviceType==portable+media+player</segment>
+		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
 	</row>
 	<row>
 		<label>Smart display</label>
@@ -56,15 +50,21 @@
 		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
 	</row>
 	<row>
-		<label>Camera</label>
+		<label>Smartphone</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==camera</segment>
-		<logo>plugins/DevicesDetection/images/screens/camera.png</logo>
+		<segment>deviceType==smartphone</segment>
+		<logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
 	</row>
 	<row>
-		<label>Portable media player</label>
+		<label>Tablet</label>
 		<nb_visits>0</nb_visits>
-		<segment>deviceType==portable+media+player</segment>
-		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
+		<segment>deviceType==tablet</segment>
+		<logo>plugins/DevicesDetection/images/screens/tablet.png</logo>
+	</row>
+	<row>
+		<label>Tv</label>
+		<nb_visits>0</nb_visits>
+		<segment>deviceType==tv</segment>
+		<logo>plugins/DevicesDetection/images/screens/tv.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getContinent_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getContinent_day.xml
index fe2b91b546..a05ce1df11 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getContinent_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getContinent_day.xml
@@ -10,6 +10,11 @@
 		<sum_visit_length>5403</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>10</revenue>
+			</row>
 			<row idgoal='ecommerceAbandonedCart'>
 				<nb_conversions>2</nb_conversions>
 				<nb_visits_converted>2</nb_visits_converted>
@@ -26,11 +31,6 @@
 				<revenue_discount>666</revenue_discount>
 				<items>10</items>
 			</row>
-			<row idgoal='1'>
-				<nb_conversions>1</nb_conversions>
-				<nb_visits_converted>1</nb_visits_converted>
-				<revenue>10</revenue>
-			</row>
 		</goals>
 		<nb_conversions>3</nb_conversions>
 		<revenue>3121.11</revenue>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml
index e1782dfd61..1ff2a7d168 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
-		<label>Victoria, Australia</label>
+		<label>Provence-Alpes-Cote d&amp;#039;Azur, France</label>
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>20</nb_actions>
@@ -10,15 +10,15 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<segment>regionCode==07;countryCode==au</segment>
-		<region>07</region>
-		<country>au</country>
-		<country_name>Australia</country_name>
-		<region_name>Victoria</region_name>
-		<logo>plugins/UserCountry/images/flags/au.png</logo>
+		<segment>regionCode==B8;countryCode==fr</segment>
+		<region>B8</region>
+		<country>fr</country>
+		<country_name>France</country_name>
+		<region_name>Provence-Alpes-Cote d'Azur</region_name>
+		<logo>plugins/UserCountry/images/flags/fr.png</logo>
 	</row>
 	<row>
-		<label>Provence-Alpes-Cote d&amp;#039;Azur, France</label>
+		<label>Victoria, Australia</label>
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>20</nb_actions>
@@ -27,12 +27,12 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<segment>regionCode==B8;countryCode==fr</segment>
-		<region>B8</region>
-		<country>fr</country>
-		<country_name>France</country_name>
-		<region_name>Provence-Alpes-Cote d'Azur</region_name>
-		<logo>plugins/UserCountry/images/flags/fr.png</logo>
+		<segment>regionCode==07;countryCode==au</segment>
+		<region>07</region>
+		<country>au</country>
+		<country_name>Australia</country_name>
+		<region_name>Victoria</region_name>
+		<logo>plugins/UserCountry/images/flags/au.png</logo>
 	</row>
 	<row>
 		<label>Others</label>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml
index 23bcf1329b..18ee2e2d93 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
+		<label>Others</label>
+		<nb_uniq_visitors>9</nb_uniq_visitors>
+		<nb_visits>45</nb_visits>
+		<nb_actions>45</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>45</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
+	</row>
+	<row>
 		<label>Firefox 6.0</label>
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
@@ -26,16 +38,4 @@
 		<segment>browserCode==IE;browserVersion==9.0</segment>
 		<logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
 	</row>
-	<row>
-		<label>Others</label>
-		<nb_uniq_visitors>9</nb_uniq_visitors>
-		<nb_visits>45</nb_visits>
-		<nb_actions>45</nb_actions>
-		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>45</bounce_count>
-		<nb_visits_converted>0</nb_visits_converted>
-		<logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
-	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml
index 99b2ce1993..715dc2a6a6 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
+		<label>Others</label>
+		<nb_uniq_visitors>8</nb_uniq_visitors>
+		<nb_visits>40</nb_visits>
+		<nb_actions>40</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>40</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
+	</row>
+	<row>
 		<label>GNU/Linux</label>
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
@@ -26,16 +38,4 @@
 		<segment>operatingSystemCode==AND;operatingSystemVersion==4.0</segment>
 		<logo>plugins/DevicesDetection/images/os/AND.gif</logo>
 	</row>
-	<row>
-		<label>Others</label>
-		<nb_uniq_visitors>8</nb_uniq_visitors>
-		<nb_visits>40</nb_visits>
-		<nb_actions>40</nb_actions>
-		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>40</bounce_count>
-		<nb_visits_converted>0</nb_visits_converted>
-		<logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
-	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getConfiguration_day.xml
index b90214c2e9..74c475fb7d 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getConfiguration_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getConfiguration_day.xml
@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
+		<label>Others</label>
+		<nb_uniq_visitors>12</nb_uniq_visitors>
+		<nb_visits>60</nb_visits>
+		<nb_actions>60</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>60</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
 		<label>GNU/Linux / Firefox / 1920x1080</label>
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>10</nb_visits>
@@ -22,15 +33,4 @@
 		<bounce_count>5</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 	</row>
-	<row>
-		<label>Others</label>
-		<nb_uniq_visitors>12</nb_uniq_visitors>
-		<nb_visits>60</nb_visits>
-		<nb_actions>60</nb_actions>
-		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>60</bounce_count>
-		<nb_visits_converted>0</nb_visits_converted>
-	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getResolution_day.xml
index 70e4bab0ff..04446a6707 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getResolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Resolution.getResolution_day.xml
@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
+		<label>Others</label>
+		<nb_uniq_visitors>8</nb_uniq_visitors>
+		<nb_visits>40</nb_visits>
+		<nb_actions>40</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>40</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
 		<label>1920x1080</label>
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
@@ -24,15 +35,4 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<segment>resolution==1280x1024</segment>
 	</row>
-	<row>
-		<label>Others</label>
-		<nb_uniq_visitors>8</nb_uniq_visitors>
-		<nb_visits>40</nb_visits>
-		<nb_actions>40</nb_actions>
-		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>40</bounce_count>
-		<nb_visits_converted>0</nb_visits_converted>
-	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml
index b9c8e33524..afe3519850 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getCity_day.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
+		<label>Others</label>
+		<nb_uniq_visitors>7</nb_uniq_visitors>
+		<nb_visits>35</nb_visits>
+		<nb_actions>35</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>35</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<logo>plugins/UserCountry/images/flags/xx.png</logo>
+	</row>
+	<row>
 		<label>Melbourne, Victoria, Australia</label>
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
@@ -36,16 +48,4 @@
 		<region_name>Provence-Alpes-Cote d'Azur</region_name>
 		<logo>plugins/UserCountry/images/flags/fr.png</logo>
 	</row>
-	<row>
-		<label>Others</label>
-		<nb_uniq_visitors>7</nb_uniq_visitors>
-		<nb_visits>35</nb_visits>
-		<nb_actions>35</nb_actions>
-		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>35</bounce_count>
-		<nb_visits_converted>0</nb_visits_converted>
-		<logo>plugins/UserCountry/images/flags/xx.png</logo>
-	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml
index e1782dfd61..54b23a9e59 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserCountry.getRegion_day.xml
@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
-		<label>Victoria, Australia</label>
-		<nb_uniq_visitors>4</nb_uniq_visitors>
-		<nb_visits>20</nb_visits>
-		<nb_actions>20</nb_actions>
+		<label>Others</label>
+		<nb_uniq_visitors>7</nb_uniq_visitors>
+		<nb_visits>35</nb_visits>
+		<nb_actions>35</nb_actions>
 		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>20</bounce_count>
+		<bounce_count>35</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<segment>regionCode==07;countryCode==au</segment>
-		<region>07</region>
-		<country>au</country>
-		<country_name>Australia</country_name>
-		<region_name>Victoria</region_name>
-		<logo>plugins/UserCountry/images/flags/au.png</logo>
+		<logo>plugins/UserCountry/images/flags/xx.png</logo>
 	</row>
 	<row>
 		<label>Provence-Alpes-Cote d&amp;#039;Azur, France</label>
@@ -35,15 +30,20 @@
 		<logo>plugins/UserCountry/images/flags/fr.png</logo>
 	</row>
 	<row>
-		<label>Others</label>
-		<nb_uniq_visitors>7</nb_uniq_visitors>
-		<nb_visits>35</nb_visits>
-		<nb_actions>35</nb_actions>
+		<label>Victoria, Australia</label>
+		<nb_uniq_visitors>4</nb_uniq_visitors>
+		<nb_visits>20</nb_visits>
+		<nb_actions>20</nb_actions>
 		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>35</bounce_count>
+		<bounce_count>20</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<logo>plugins/UserCountry/images/flags/xx.png</logo>
+		<segment>regionCode==07;countryCode==au</segment>
+		<region>07</region>
+		<country>au</country>
+		<country_name>Australia</country_name>
+		<region_name>Victoria</region_name>
+		<logo>plugins/UserCountry/images/flags/au.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml
index e1782dfd61..1ff2a7d168 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
-		<label>Victoria, Australia</label>
+		<label>Provence-Alpes-Cote d&amp;#039;Azur, France</label>
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>20</nb_actions>
@@ -10,15 +10,15 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<segment>regionCode==07;countryCode==au</segment>
-		<region>07</region>
-		<country>au</country>
-		<country_name>Australia</country_name>
-		<region_name>Victoria</region_name>
-		<logo>plugins/UserCountry/images/flags/au.png</logo>
+		<segment>regionCode==B8;countryCode==fr</segment>
+		<region>B8</region>
+		<country>fr</country>
+		<country_name>France</country_name>
+		<region_name>Provence-Alpes-Cote d'Azur</region_name>
+		<logo>plugins/UserCountry/images/flags/fr.png</logo>
 	</row>
 	<row>
-		<label>Provence-Alpes-Cote d&amp;#039;Azur, France</label>
+		<label>Victoria, Australia</label>
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>20</nb_actions>
@@ -27,12 +27,12 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<segment>regionCode==B8;countryCode==fr</segment>
-		<region>B8</region>
-		<country>fr</country>
-		<country_name>France</country_name>
-		<region_name>Provence-Alpes-Cote d'Azur</region_name>
-		<logo>plugins/UserCountry/images/flags/fr.png</logo>
+		<segment>regionCode==07;countryCode==au</segment>
+		<region>07</region>
+		<country>au</country>
+		<country_name>Australia</country_name>
+		<region_name>Victoria</region_name>
+		<logo>plugins/UserCountry/images/flags/au.png</logo>
 	</row>
 	<row>
 		<label>Others</label>