updated a couple of test files

38 files changed, 3113 insertions, 5077 deletions

diff --git a/tests/PHPUnit/System/RowEvolutionTest.php b/tests/PHPUnit/System/RowEvolutionTest.php
index 0fba18234d..7937e99964 100755
--- a/tests/PHPUnit/System/RowEvolutionTest.php
+++ b/tests/PHPUnit/System/RowEvolutionTest.php
@@ -163,8 +163,8 @@ class RowEvolutionTest extends SystemTestCase
             'otherRequestParameters' => array(
                 'date'      => '2010-03-01,2010-03-06',
                 'period'    => 'month',
-                'apiModule' => 'UserSettings',
-                'apiAction' => 'getBrowser',
+                'apiModule' => 'DevicesDetection',
+                'apiAction' => 'getBrowsers',
                 'label'     => 'Firefox,Chrome,Opera'
             )
         ));
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
index 188f7cb3c2..c54a8e5f59 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
@@ -33,6 +33,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId>userid.email@example.org</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -46,8 +48,18 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>WebKit</browserFamily>
+		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>Safari</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+		<browserCode>SF</browserCode>
+		<browserVersion />
+		<events>0</events>
 		<referrerType>search</referrerType>
 		<referrerTypeName>Search Engines</referrerTypeName>
 		<referrerName>Google</referrerName>
@@ -56,14 +68,17 @@
 		<referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Safari </browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
-		<browserCode>SF</browserCode>
-		<browserVersion />
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>United States</country>
+		<countryCode>us</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
+		<region>California</region>
+		<regionCode>CA</regionCode>
+		<city>not a city</city>
+		<location>not a city, California, United States</location>
+		<latitude>1</latitude>
+		<longitude>2</longitude>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -78,29 +93,14 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>WebKit</browserFamily>
-		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
-		<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>California</region>
-		<regionCode>CA</regionCode>
-		<city>not a city</city>
-		<location>not a city, California, United States</location>
-		<latitude>1</latitude>
-		<longitude>2</longitude>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<customVariables>
+		</customVariables>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
-		<customVariables>
-		</customVariables>
 		
 		
 		
@@ -181,6 +181,8 @@
 		
 		
 		
+		<searches>1</searches>
+		<actions>3</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -194,8 +196,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>1</searches>
-		<actions>3</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -204,14 +216,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Unknown</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -226,27 +241,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Unknown</continent>
-		<continentCode>unk</continentCode>
-		<country>Unknown</country>
-		<countryCode>xx</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Unknown</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -257,6 +254,9 @@
 				<customVariableValue5>Cvar5 value is 8</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -306,6 +306,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -319,8 +321,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -329,14 +341,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Unknown</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -351,27 +366,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Unknown</continent>
-		<continentCode>unk</continentCode>
-		<country>Unknown</country>
-		<countryCode>xx</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Unknown</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -382,6 +379,9 @@
 				<customVariableValue5>Cvar5 value is 8</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -445,6 +445,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>2</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -458,8 +460,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>2</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -468,14 +480,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Macedonia, the Former Yugoslav Republic of</country>
+		<countryCode>mk</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
+		<region>Miravci</region>
+		<regionCode>66</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -490,27 +505,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Macedonia, the Former Yugoslav Republic of</country>
-		<countryCode>mk</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
-		<region>Miravci</region>
-		<regionCode>66</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -521,6 +518,9 @@
 				<customVariableValue5>Cvar5 value is 7</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -570,6 +570,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -583,8 +585,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -593,14 +605,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Macedonia, the Former Yugoslav Republic of</country>
+		<countryCode>mk</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
+		<region>Miravci</region>
+		<regionCode>66</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -615,27 +630,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Macedonia, the Former Yugoslav Republic of</country>
-		<countryCode>mk</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
-		<region>Miravci</region>
-		<regionCode>66</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -646,6 +643,9 @@
 				<customVariableValue5>Cvar5 value is 7</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -726,6 +726,8 @@
 		
 		
 		
+		<searches>1</searches>
+		<actions>3</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -739,8 +741,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>1</searches>
-		<actions>3</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -749,14 +761,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Russian Federation</country>
+		<countryCode>ru</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
+		<region>Saint Petersburg City</region>
+		<regionCode>66</regionCode>
+		<city>Hluboká nad Vltavou</city>
+		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -771,27 +786,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<regionCode>66</regionCode>
-		<city>Hluboká nad Vltavou</city>
-		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -802,6 +799,9 @@
 				<customVariableValue5>Cvar5 value is 6</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -851,6 +851,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -864,8 +866,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -874,14 +886,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Russian Federation</country>
+		<countryCode>ru</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
+		<region>Saint Petersburg City</region>
+		<regionCode>66</regionCode>
+		<city>Hluboká nad Vltavou</city>
+		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -896,27 +911,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<regionCode>66</regionCode>
-		<city>Hluboká nad Vltavou</city>
-		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -927,6 +924,9 @@
 				<customVariableValue5>Cvar5 value is 6</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -990,6 +990,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>2</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -1003,8 +1005,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>2</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -1013,14 +1025,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Russian Federation</country>
+		<countryCode>ru</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
+		<region>Saint Petersburg City</region>
+		<regionCode>66</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -1035,27 +1050,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<regionCode>66</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -1066,6 +1063,9 @@
 				<customVariableValue5>Cvar5 value is 5</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -1115,6 +1115,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -1128,8 +1130,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -1138,14 +1150,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Russian Federation</country>
+		<countryCode>ru</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
+		<region>Saint Petersburg City</region>
+		<regionCode>66</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -1160,27 +1175,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<regionCode>66</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -1191,6 +1188,9 @@
 				<customVariableValue5>Cvar5 value is 5</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -1271,6 +1271,8 @@
 		
 		
 		
+		<searches>1</searches>
+		<actions>3</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -1284,8 +1286,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>1</searches>
-		<actions>3</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -1294,14 +1306,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>Kent</region>
+		<regionCode>G5</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Kent, United Kingdom</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -1316,27 +1331,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>United Kingdom</country>
-		<countryCode>gb</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
-		<region>Kent</region>
-		<regionCode>G5</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Kent, United Kingdom</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>awesomeisp.com</provider>
-		<providerName>Awesomeisp</providerName>
-		<providerUrl>http://www.awesomeisp.com/</providerUrl>
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -1347,6 +1344,9 @@
 				<customVariableValue5>Cvar5 value is 4</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>awesomeisp.com</provider>
+		<providerName>Awesomeisp</providerName>
+		<providerUrl>http://www.awesomeisp.com/</providerUrl>
 		
 		
 		
@@ -1396,6 +1396,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -1409,8 +1411,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -1419,14 +1431,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>Kent</region>
+		<regionCode>G5</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Kent, United Kingdom</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -1441,27 +1456,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>United Kingdom</country>
-		<countryCode>gb</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
-		<region>Kent</region>
-		<regionCode>G5</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Kent, United Kingdom</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>awesomeisp.com</provider>
-		<providerName>Awesomeisp</providerName>
-		<providerUrl>http://www.awesomeisp.com/</providerUrl>
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -1472,6 +1469,9 @@
 				<customVariableValue5>Cvar5 value is 4</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>awesomeisp.com</provider>
+		<providerName>Awesomeisp</providerName>
+		<providerUrl>http://www.awesomeisp.com/</providerUrl>
 		
 		
 		
@@ -1535,6 +1535,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>2</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -1548,8 +1550,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>2</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -1558,14 +1570,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>London, City of</region>
+		<regionCode>H9</regionCode>
+		<city>London</city>
+		<location>London, London, City of, United Kingdom</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -1580,27 +1595,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>United Kingdom</country>
-		<countryCode>gb</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
-		<region>London, City of</region>
-		<regionCode>H9</regionCode>
-		<city>London</city>
-		<location>London, London, City of, United Kingdom</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -1611,6 +1608,9 @@
 				<customVariableValue5>Cvar5 value is 3</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -1674,6 +1674,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>2</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -1687,8 +1689,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>2</actions>
+		<deviceType>Unknown</deviceType>
+		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemCode>UNK</operatingSystemCode>
+		<operatingSystemShortName>Unknown</operatingSystemShortName>
+		<operatingSystemIcon>UNK</operatingSystemIcon>
+		<browserFamily />
+		<browserFamilyDescription>Unknown</browserFamilyDescription>
+		<browserName>Unknown</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserCode>UNK</browserCode>
+		<browserVersion />
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -1697,14 +1709,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Unknown</operatingSystem>
-		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemShortName>Unknown</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
-		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
-		<browserCode>UNK</browserCode>
-		<browserVersion />
+		<continent>Asia</continent>
+		<continentCode>asi</continentCode>
+		<country>Tibet</country>
+		<countryCode>ti</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ti.png</countryFlag>
+		<region>Unknown</region>
+		<regionCode>1</regionCode>
+		<city>Lhasa</city>
+		<location>Lhasa, Unknown, Tibet</location>
+		<latitude>29.650000</latitude>
+		<longitude>91.099998</longitude>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -1719,29 +1734,14 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Unknown</deviceType>
-		<browserFamily />
-		<browserFamilyDescription>Unknown</browserFamilyDescription>
-		<events>1</events>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Tibet</country>
-		<countryCode>ti</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ti.png</countryFlag>
-		<region>Unknown</region>
-		<regionCode>1</regionCode>
-		<city>Lhasa</city>
-		<location>Lhasa, Unknown, Tibet</location>
-		<latitude>29.650000</latitude>
-		<longitude>91.099998</longitude>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<customVariables>
+		</customVariables>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
-		<customVariables>
-		</customVariables>
 		
 		
 		
@@ -1791,6 +1791,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -1804,8 +1806,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -1814,14 +1826,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>London, City of</region>
+		<regionCode>H9</regionCode>
+		<city>London</city>
+		<location>London, London, City of, United Kingdom</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -1836,27 +1851,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>United Kingdom</country>
-		<countryCode>gb</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
-		<region>London, City of</region>
-		<regionCode>H9</regionCode>
-		<city>London</city>
-		<location>London, London, City of, United Kingdom</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -1867,6 +1864,9 @@
 				<customVariableValue5>Cvar5 value is 3</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -1916,6 +1916,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -1929,8 +1931,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Unknown</deviceType>
+		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemCode>UNK</operatingSystemCode>
+		<operatingSystemShortName>Unknown</operatingSystemShortName>
+		<operatingSystemIcon>UNK</operatingSystemIcon>
+		<browserFamily />
+		<browserFamilyDescription>Unknown</browserFamilyDescription>
+		<browserName>Unknown</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserCode>UNK</browserCode>
+		<browserVersion />
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -1939,14 +1951,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Unknown</operatingSystem>
-		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemShortName>Unknown</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
-		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
-		<browserCode>UNK</browserCode>
-		<browserVersion />
+		<continent>Asia</continent>
+		<continentCode>asi</continentCode>
+		<country>Tibet</country>
+		<countryCode>ti</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ti.png</countryFlag>
+		<region>Unknown</region>
+		<regionCode>1</regionCode>
+		<city>Lhasa</city>
+		<location>Lhasa, Unknown, Tibet</location>
+		<latitude>29.650000</latitude>
+		<longitude>91.099998</longitude>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -1961,27 +1976,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Unknown</deviceType>
-		<browserFamily />
-		<browserFamilyDescription>Unknown</browserFamilyDescription>
-		<events>0</events>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Tibet</country>
-		<countryCode>ti</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ti.png</countryFlag>
-		<region>Unknown</region>
-		<regionCode>1</regionCode>
-		<city>Lhasa</city>
-		<location>Lhasa, Unknown, Tibet</location>
-		<latitude>29.650000</latitude>
-		<longitude>91.099998</longitude>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -1992,6 +1989,9 @@
 				<customVariableValue5>Cvar5 value is 3</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -2072,6 +2072,8 @@
 		
 		
 		
+		<searches>1</searches>
+		<actions>3</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -2085,8 +2087,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>1</searches>
-		<actions>3</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -2095,14 +2107,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>Warwickshire</region>
+		<regionCode>P3</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Warwickshire, United Kingdom</location>
+		<latitude>124.456001</latitude>
+		<longitude>22.231001</longitude>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -2117,27 +2132,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>United Kingdom</country>
-		<countryCode>gb</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
-		<region>Warwickshire</region>
-		<regionCode>P3</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Warwickshire, United Kingdom</location>
-		<latitude>124.456001</latitude>
-		<longitude>22.231001</longitude>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>comcast.net</provider>
-		<providerName>Comcast</providerName>
-		<providerUrl>http://www.comcast.net/</providerUrl>
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -2148,6 +2145,9 @@
 				<customVariableValue5>Cvar5 value is 2</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>comcast.net</provider>
+		<providerName>Comcast</providerName>
+		<providerUrl>http://www.comcast.net/</providerUrl>
 		
 		
 		
@@ -2228,6 +2228,8 @@
 		
 		
 		
+		<searches>1</searches>
+		<actions>3</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -2241,8 +2243,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>1</searches>
-		<actions>3</actions>
+		<deviceType>Unknown</deviceType>
+		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemCode>UNK</operatingSystemCode>
+		<operatingSystemShortName>Unknown</operatingSystemShortName>
+		<operatingSystemIcon>UNK</operatingSystemIcon>
+		<browserFamily />
+		<browserFamilyDescription>Unknown</browserFamilyDescription>
+		<browserName>Unknown</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserCode>UNK</browserCode>
+		<browserVersion />
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -2251,14 +2263,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Unknown</operatingSystem>
-		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemShortName>Unknown</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
-		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
-		<browserCode>UNK</browserCode>
-		<browserVersion />
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Unknown</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -2273,29 +2288,14 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Unknown</deviceType>
-		<browserFamily />
-		<browserFamilyDescription>Unknown</browserFamilyDescription>
-		<events>1</events>
-		<continent>Unknown</continent>
-		<continentCode>unk</continentCode>
-		<country>Unknown</country>
-		<countryCode>xx</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Unknown</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<customVariables>
+		</customVariables>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
-		<customVariables>
-		</customVariables>
 		
 		
 		
@@ -2345,6 +2345,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -2358,8 +2360,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -2368,14 +2380,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>Warwickshire</region>
+		<regionCode>P3</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Warwickshire, United Kingdom</location>
+		<latitude>124.456001</latitude>
+		<longitude>22.231001</longitude>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -2390,27 +2405,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>United Kingdom</country>
-		<countryCode>gb</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
-		<region>Warwickshire</region>
-		<regionCode>P3</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Warwickshire, United Kingdom</location>
-		<latitude>124.456001</latitude>
-		<longitude>22.231001</longitude>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>comcast.net</provider>
-		<providerName>Comcast</providerName>
-		<providerUrl>http://www.comcast.net/</providerUrl>
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -2421,6 +2418,9 @@
 				<customVariableValue5>Cvar5 value is 2</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>comcast.net</provider>
+		<providerName>Comcast</providerName>
+		<providerUrl>http://www.comcast.net/</providerUrl>
 		
 		
 		
@@ -2470,6 +2470,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -2483,8 +2485,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Unknown</deviceType>
+		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemCode>UNK</operatingSystemCode>
+		<operatingSystemShortName>Unknown</operatingSystemShortName>
+		<operatingSystemIcon>UNK</operatingSystemIcon>
+		<browserFamily />
+		<browserFamilyDescription>Unknown</browserFamilyDescription>
+		<browserName>Unknown</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserCode>UNK</browserCode>
+		<browserVersion />
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -2493,14 +2505,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Unknown</operatingSystem>
-		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemShortName>Unknown</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
-		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
-		<browserCode>UNK</browserCode>
-		<browserVersion />
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Unknown</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -2515,27 +2530,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Unknown</deviceType>
-		<browserFamily />
-		<browserFamilyDescription>Unknown</browserFamilyDescription>
-		<events>0</events>
-		<continent>Unknown</continent>
-		<continentCode>unk</continentCode>
-		<country>Unknown</country>
-		<countryCode>xx</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Unknown</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -2546,6 +2543,9 @@
 				<customVariableValue5>Cvar5 value is 2</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -2609,6 +2609,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>2</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -2622,8 +2624,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>2</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -2632,14 +2644,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>Warwickshire</region>
+		<regionCode>P3</regionCode>
+		<city>Nuneaton and Bedworth</city>
+		<location>Nuneaton and Bedworth, Warwickshire, United Kingdom</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -2654,27 +2669,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>United Kingdom</country>
-		<countryCode>gb</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
-		<region>Warwickshire</region>
-		<regionCode>P3</regionCode>
-		<city>Nuneaton and Bedworth</city>
-		<location>Nuneaton and Bedworth, Warwickshire, United Kingdom</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -2685,6 +2682,9 @@
 				<customVariableValue5>Cvar5 value is 1</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -2748,6 +2748,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>2</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -2761,8 +2763,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>2</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -2771,14 +2783,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>Canada</country>
+		<countryCode>ca</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag>
+		<region>British Columbia</region>
+		<regionCode>BC</regionCode>
+		<city>Vancouver</city>
+		<location>Vancouver, British Columbia, Canada</location>
+		<latitude>49.250000</latitude>
+		<longitude>-123.133003</longitude>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -2793,27 +2808,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>North America</continent>
-		<continentCode>amn</continentCode>
-		<country>Canada</country>
-		<countryCode>ca</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag>
-		<region>British Columbia</region>
-		<regionCode>BC</regionCode>
-		<city>Vancouver</city>
-		<location>Vancouver, British Columbia, Canada</location>
-		<latitude>49.250000</latitude>
-		<longitude>-123.133003</longitude>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -2824,6 +2821,9 @@
 				<customVariableValue5>Cvar5 value is 1</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -2887,6 +2887,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>2</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -2900,8 +2902,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>2</actions>
+		<deviceType>Unknown</deviceType>
+		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemCode>UNK</operatingSystemCode>
+		<operatingSystemShortName>Unknown</operatingSystemShortName>
+		<operatingSystemIcon>UNK</operatingSystemIcon>
+		<browserFamily />
+		<browserFamilyDescription>Unknown</browserFamilyDescription>
+		<browserName>Unknown</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserCode>UNK</browserCode>
+		<browserVersion />
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -2910,14 +2922,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Unknown</operatingSystem>
-		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemShortName>Unknown</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
-		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
-		<browserCode>UNK</browserCode>
-		<browserVersion />
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>Canada</country>
+		<countryCode>ca</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag>
+		<region>British Columbia</region>
+		<regionCode>BC</regionCode>
+		<city>Vancouver</city>
+		<location>Vancouver, British Columbia, Canada</location>
+		<latitude>49.250000</latitude>
+		<longitude>-123.133003</longitude>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -2932,29 +2947,14 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Unknown</deviceType>
-		<browserFamily />
-		<browserFamilyDescription>Unknown</browserFamilyDescription>
-		<events>1</events>
-		<continent>North America</continent>
-		<continentCode>amn</continentCode>
-		<country>Canada</country>
-		<countryCode>ca</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag>
-		<region>British Columbia</region>
-		<regionCode>BC</regionCode>
-		<city>Vancouver</city>
-		<location>Vancouver, British Columbia, Canada</location>
-		<latitude>49.250000</latitude>
-		<longitude>-123.133003</longitude>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<customVariables>
+		</customVariables>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
-		<customVariables>
-		</customVariables>
 		
 		
 		
@@ -3018,6 +3018,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>2</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -3031,8 +3033,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>2</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -3041,14 +3053,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Asia</continent>
+		<continentCode>asi</continentCode>
+		<country>Indonesia</country>
+		<countryCode>id</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/id.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Indonesia</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -3063,27 +3078,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Indonesia</country>
-		<countryCode>id</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/id.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Indonesia</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -3094,6 +3091,9 @@
 				<customVariableValue5>Cvar5 value is 1</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -3143,6 +3143,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -3156,8 +3158,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -3166,14 +3178,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>Warwickshire</region>
+		<regionCode>P3</regionCode>
+		<city>Nuneaton and Bedworth</city>
+		<location>Nuneaton and Bedworth, Warwickshire, United Kingdom</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -3188,27 +3203,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>United Kingdom</country>
-		<countryCode>gb</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
-		<region>Warwickshire</region>
-		<regionCode>P3</regionCode>
-		<city>Nuneaton and Bedworth</city>
-		<location>Nuneaton and Bedworth, Warwickshire, United Kingdom</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -3219,6 +3216,9 @@
 				<customVariableValue5>Cvar5 value is 1</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -3268,6 +3268,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -3281,8 +3283,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -3291,14 +3303,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>Canada</country>
+		<countryCode>ca</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag>
+		<region>British Columbia</region>
+		<regionCode>BC</regionCode>
+		<city>Vancouver</city>
+		<location>Vancouver, British Columbia, Canada</location>
+		<latitude>49.250000</latitude>
+		<longitude>-123.133003</longitude>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -3313,27 +3328,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>North America</continent>
-		<continentCode>amn</continentCode>
-		<country>Canada</country>
-		<countryCode>ca</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag>
-		<region>British Columbia</region>
-		<regionCode>BC</regionCode>
-		<city>Vancouver</city>
-		<location>Vancouver, British Columbia, Canada</location>
-		<latitude>49.250000</latitude>
-		<longitude>-123.133003</longitude>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -3344,6 +3341,9 @@
 				<customVariableValue5>Cvar5 value is 1</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -3393,6 +3393,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -3406,8 +3408,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Unknown</deviceType>
+		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemCode>UNK</operatingSystemCode>
+		<operatingSystemShortName>Unknown</operatingSystemShortName>
+		<operatingSystemIcon>UNK</operatingSystemIcon>
+		<browserFamily />
+		<browserFamilyDescription>Unknown</browserFamilyDescription>
+		<browserName>Unknown</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserCode>UNK</browserCode>
+		<browserVersion />
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -3416,14 +3428,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Unknown</operatingSystem>
-		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemShortName>Unknown</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
-		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
-		<browserCode>UNK</browserCode>
-		<browserVersion />
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>Canada</country>
+		<countryCode>ca</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag>
+		<region>British Columbia</region>
+		<regionCode>BC</regionCode>
+		<city>Vancouver</city>
+		<location>Vancouver, British Columbia, Canada</location>
+		<latitude>49.250000</latitude>
+		<longitude>-123.133003</longitude>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -3438,27 +3453,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Unknown</deviceType>
-		<browserFamily />
-		<browserFamilyDescription>Unknown</browserFamilyDescription>
-		<events>0</events>
-		<continent>North America</continent>
-		<continentCode>amn</continentCode>
-		<country>Canada</country>
-		<countryCode>ca</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag>
-		<region>British Columbia</region>
-		<regionCode>BC</regionCode>
-		<city>Vancouver</city>
-		<location>Vancouver, British Columbia, Canada</location>
-		<latitude>49.250000</latitude>
-		<longitude>-123.133003</longitude>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -3469,6 +3466,9 @@
 				<customVariableValue5>Cvar5 value is 1</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -3518,6 +3518,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -3531,8 +3533,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -3541,14 +3553,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Asia</continent>
+		<continentCode>asi</continentCode>
+		<country>Indonesia</country>
+		<countryCode>id</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/id.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Indonesia</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -3563,27 +3578,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Indonesia</country>
-		<countryCode>id</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/id.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Indonesia</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -3594,6 +3591,9 @@
 				<customVariableValue5>Cvar5 value is 1</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -3674,6 +3674,8 @@
 		
 		
 		
+		<searches>1</searches>
+		<actions>3</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -3687,8 +3689,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>1</searches>
-		<actions>3</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -3697,14 +3709,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>Warwickshire</region>
+		<regionCode>P3</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Warwickshire, United Kingdom</location>
+		<latitude>123.456001</latitude>
+		<longitude>21.320999</longitude>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -3719,27 +3734,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>United Kingdom</country>
-		<countryCode>gb</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
-		<region>Warwickshire</region>
-		<regionCode>P3</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Warwickshire, United Kingdom</location>
-		<latitude>123.456001</latitude>
-		<longitude>21.320999</longitude>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -3750,6 +3747,9 @@
 				<customVariableValue5>Cvar5 value is 0</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -3830,6 +3830,8 @@
 		
 		
 		
+		<searches>1</searches>
+		<actions>3</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -3843,8 +3845,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>1</searches>
-		<actions>3</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -3853,14 +3865,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>France</country>
+		<countryCode>fr</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+		<region>Franche-Comte</region>
+		<regionCode>A6</regionCode>
+		<city>Besançon</city>
+		<location>Besançon, Franche-Comte, France</location>
+		<latitude>47.249001</latitude>
+		<longitude>6.018000</longitude>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -3875,27 +3890,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>France</country>
-		<countryCode>fr</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
-		<region>Franche-Comte</region>
-		<regionCode>A6</regionCode>
-		<city>Besançon</city>
-		<location>Besançon, Franche-Comte, France</location>
-		<latitude>47.249001</latitude>
-		<longitude>6.018000</longitude>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -3906,6 +3903,9 @@
 				<customVariableValue5>Cvar5 value is 0</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -3986,6 +3986,8 @@
 		
 		
 		
+		<searches>1</searches>
+		<actions>3</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -3999,8 +4001,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>1</searches>
-		<actions>3</actions>
+		<deviceType>Unknown</deviceType>
+		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemCode>UNK</operatingSystemCode>
+		<operatingSystemShortName>Unknown</operatingSystemShortName>
+		<operatingSystemIcon>UNK</operatingSystemIcon>
+		<browserFamily />
+		<browserFamilyDescription>Unknown</browserFamilyDescription>
+		<browserName>Unknown</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserCode>UNK</browserCode>
+		<browserVersion />
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -4009,14 +4021,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Unknown</operatingSystem>
-		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemShortName>Unknown</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
-		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
-		<browserCode>UNK</browserCode>
-		<browserVersion />
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>Canada</country>
+		<countryCode>ca</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag>
+		<region>British Columbia</region>
+		<regionCode>BC</regionCode>
+		<city>Vancouver</city>
+		<location>Vancouver, British Columbia, Canada</location>
+		<latitude>49.250000</latitude>
+		<longitude>-123.133003</longitude>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -4031,29 +4046,14 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Unknown</deviceType>
-		<browserFamily />
-		<browserFamilyDescription>Unknown</browserFamilyDescription>
-		<events>1</events>
-		<continent>North America</continent>
-		<continentCode>amn</continentCode>
-		<country>Canada</country>
-		<countryCode>ca</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag>
-		<region>British Columbia</region>
-		<regionCode>BC</regionCode>
-		<city>Vancouver</city>
-		<location>Vancouver, British Columbia, Canada</location>
-		<latitude>49.250000</latitude>
-		<longitude>-123.133003</longitude>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<customVariables>
+		</customVariables>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
-		<customVariables>
-		</customVariables>
 		
 		
 		
@@ -4134,6 +4134,8 @@
 		
 		
 		
+		<searches>1</searches>
+		<actions>3</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -4147,8 +4149,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>1</searches>
-		<actions>3</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -4157,14 +4169,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Italy</country>
+		<countryCode>it</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/it.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Italy</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -4179,27 +4194,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Italy</country>
-		<countryCode>it</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/it.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Italy</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -4210,6 +4207,9 @@
 				<customVariableValue5>Cvar5 value is 0</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -4259,6 +4259,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -4272,8 +4274,18 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -4282,14 +4294,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>Warwickshire</region>
+		<regionCode>P3</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Warwickshire, United Kingdom</location>
+		<latitude>123.456001</latitude>
+		<longitude>21.320999</longitude>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -4304,27 +4319,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>United Kingdom</country>
-		<countryCode>gb</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
-		<region>Warwickshire</region>
-		<regionCode>P3</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Warwickshire, United Kingdom</location>
-		<latitude>123.456001</latitude>
-		<longitude>21.320999</longitude>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -4335,6 +4332,9 @@
 				<customVariableValue5>Cvar5 value is 0</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -4384,6 +4384,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -4397,8 +4399,18 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -4407,14 +4419,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>France</country>
+		<countryCode>fr</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+		<region>Franche-Comte</region>
+		<regionCode>A6</regionCode>
+		<city>Besançon</city>
+		<location>Besançon, Franche-Comte, France</location>
+		<latitude>47.249001</latitude>
+		<longitude>6.018000</longitude>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -4429,27 +4444,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>France</country>
-		<countryCode>fr</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
-		<region>Franche-Comte</region>
-		<regionCode>A6</regionCode>
-		<city>Besançon</city>
-		<location>Besançon, Franche-Comte, France</location>
-		<latitude>47.249001</latitude>
-		<longitude>6.018000</longitude>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -4460,6 +4457,9 @@
 				<customVariableValue5>Cvar5 value is 0</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -4509,6 +4509,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -4522,8 +4524,18 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -4532,14 +4544,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>Canada</country>
+		<countryCode>ca</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag>
+		<region>British Columbia</region>
+		<regionCode>BC</regionCode>
+		<city>Vancouver</city>
+		<location>Vancouver, British Columbia, Canada</location>
+		<latitude>49.250000</latitude>
+		<longitude>-123.133003</longitude>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -4554,27 +4569,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>North America</continent>
-		<continentCode>amn</continentCode>
-		<country>Canada</country>
-		<countryCode>ca</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag>
-		<region>British Columbia</region>
-		<regionCode>BC</regionCode>
-		<city>Vancouver</city>
-		<location>Vancouver, British Columbia, Canada</location>
-		<latitude>49.250000</latitude>
-		<longitude>-123.133003</longitude>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -4585,6 +4582,9 @@
 				<customVariableValue5>Cvar5 value is 0</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -4634,6 +4634,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -4647,8 +4649,18 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -4657,14 +4669,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Italy</country>
+		<countryCode>it</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/it.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Italy</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -4679,27 +4694,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Italy</country>
-		<countryCode>it</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/it.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Italy</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -4710,6 +4707,9 @@
 				<customVariableValue5>Cvar5 value is 0</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
index a0cd8d2485..7dffbd794a 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
@@ -46,8 +46,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>1</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -71,14 +79,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -148,8 +148,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>1</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -173,14 +181,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -318,8 +318,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>6</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -343,14 +351,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -420,8 +420,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>1</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -445,14 +453,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -757,8 +757,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>13</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -782,14 +790,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -859,8 +859,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>1</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -884,14 +892,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -957,8 +957,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>1</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -982,14 +990,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -1123,8 +1123,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>6</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -1148,14 +1156,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -1221,8 +1221,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>1</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -1246,14 +1254,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -1554,8 +1554,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>13</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -1579,14 +1587,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
index a0cd8d2485..7dffbd794a 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
@@ -46,8 +46,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>1</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -71,14 +79,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -148,8 +148,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>1</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -173,14 +181,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -318,8 +318,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>6</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -343,14 +351,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -420,8 +420,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>1</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -445,14 +453,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -757,8 +757,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>13</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -782,14 +790,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -859,8 +859,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>1</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -884,14 +892,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -957,8 +957,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>1</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -982,14 +990,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -1123,8 +1123,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>6</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -1148,14 +1156,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -1221,8 +1221,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>1</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -1246,14 +1254,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -1554,8 +1554,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>13</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -1579,14 +1587,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
index 77308fd9e7..77308fd9e7 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
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 276e820253..0a059a62d6 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
@@ -36,4 +36,39 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
 	</row>
+	<row>
+		<label>Tablet</label>
+		<nb_visits>0</nb_visits>
+		<logo>plugins/DevicesDetection/images/screens/tablet.png</logo>
+	</row>
+	<row>
+		<label>Feature phone</label>
+		<nb_visits>0</nb_visits>
+		<logo>plugins/DevicesDetection/images/screens/mobile.gif</logo>
+	</row>
+	<row>
+		<label>Console</label>
+		<nb_visits>0</nb_visits>
+		<logo>plugins/DevicesDetection/images/screens/console.gif</logo>
+	</row>
+	<row>
+		<label>Tv</label>
+		<nb_visits>0</nb_visits>
+		<logo>plugins/DevicesDetection/images/screens/tv.png</logo>
+	</row>
+	<row>
+		<label>Car browser</label>
+		<nb_visits>0</nb_visits>
+		<logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo>
+	</row>
+	<row>
+		<label>Smart display</label>
+		<nb_visits>0</nb_visits>
+		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
+	</row>
+	<row>
+		<label>Camera</label>
+		<nb_visits>0</nb_visits>
+		<logo>plugins/DevicesDetection/images/screens/camera.png</logo>
+	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
index cdcfa194b1..6226e35b32 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
@@ -62,8 +62,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows 8.1</operatingSystem>
+		<operatingSystemCode>W81</operatingSystemCode>
+		<operatingSystemShortName>Windows 8.1</operatingSystemShortName>
+		<operatingSystemIcon>W81</operatingSystemIcon>
 		<browserFamily>Blink</browserFamily>
 		<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
+		<browserName>Chrome 33.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserCode>CH</browserCode>
+		<browserVersion>33.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -87,14 +95,6 @@
 		<location>Raleigh, North Carolina, United States</location>
 		<latitude>35.771999</latitude>
 		<longitude>-78.639000</longitude>
-		<operatingSystem>Windows 8.1</operatingSystem>
-		<operatingSystemCode>W81</operatingSystemCode>
-		<operatingSystemShortName>W81</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/W81.gif</operatingSystemIcon>
-		<browserName>Chrome 33.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
-		<browserCode>CH</browserCode>
-		<browserVersion>33.0</browserVersion>
 		<screenType>wide</screenType>
 		<resolution>1366x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
@@ -200,8 +200,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows 7</operatingSystem>
+		<operatingSystemCode>WI7</operatingSystemCode>
+		<operatingSystemShortName>Win 7</operatingSystemShortName>
+		<operatingSystemIcon>WI7</operatingSystemIcon>
 		<browserFamily>Trident</browserFamily>
 		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
+		<browserName>Internet Explorer 8.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browserCode>IE</browserCode>
+		<browserVersion>8.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -225,14 +233,6 @@
 		<location>Lake Forest, California, United States</location>
 		<latitude>33.645000</latitude>
 		<longitude>-117.679001</longitude>
-		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemShortName>Win 7</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
-		<browserName>Internet Explorer 8.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
-		<browserCode>IE</browserCode>
-		<browserVersion>8.0</browserVersion>
 		<screenType>wide</screenType>
 		<resolution>1536x864</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
@@ -313,8 +313,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows 7</operatingSystem>
+		<operatingSystemCode>WI7</operatingSystemCode>
+		<operatingSystemShortName>Win 7</operatingSystemShortName>
+		<operatingSystemIcon>WI7</operatingSystemIcon>
 		<browserFamily>Blink</browserFamily>
 		<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
+		<browserName>Chrome 34.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserCode>CH</browserCode>
+		<browserVersion>34.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -338,14 +346,6 @@
 		<location>Germany</location>
 		<latitude>51</latitude>
 		<longitude>9</longitude>
-		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemShortName>Win 7</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
-		<browserName>Chrome 34.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
-		<browserCode>CH</browserCode>
-		<browserVersion>34.0</browserVersion>
 		<screenType>wide</screenType>
 		<resolution>1920x1200</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
@@ -459,8 +459,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Mac</operatingSystem>
+		<operatingSystemCode>MAC</operatingSystemCode>
+		<operatingSystemShortName>Mac</operatingSystemShortName>
+		<operatingSystemIcon>MAC</operatingSystemIcon>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>Safari 7.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+		<browserCode>SF</browserCode>
+		<browserVersion>7.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -484,14 +492,6 @@
 		<location>United States</location>
 		<latitude>38</latitude>
 		<longitude>-97</longitude>
-		<operatingSystem>Mac OS</operatingSystem>
-		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemShortName>Mac OS</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
-		<browserName>Safari 7.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
-		<browserCode>SF</browserCode>
-		<browserVersion>7.0</browserVersion>
 		<screenType>wide</screenType>
 		<resolution>2880x1800</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
@@ -574,8 +574,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows 7</operatingSystem>
+		<operatingSystemCode>WI7</operatingSystemCode>
+		<operatingSystemShortName>Win 7</operatingSystemShortName>
+		<operatingSystemIcon>WI7</operatingSystemIcon>
 		<browserFamily>Blink</browserFamily>
 		<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
+		<browserName>Chrome 33.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserCode>CH</browserCode>
+		<browserVersion>33.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -599,14 +607,6 @@
 		<location>Maaseik, Limburg, Belgium</location>
 		<latitude>51.099998</latitude>
 		<longitude>5.800000</longitude>
-		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemShortName>Win 7</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
-		<browserName>Chrome 33.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
-		<browserCode>CH</browserCode>
-		<browserVersion>33.0</browserVersion>
 		<screenType>wide</screenType>
 		<resolution>1920x1080</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
@@ -700,8 +700,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Mac</operatingSystem>
+		<operatingSystemCode>MAC</operatingSystemCode>
+		<operatingSystemShortName>Mac</operatingSystemShortName>
+		<operatingSystemIcon>MAC</operatingSystemIcon>
 		<browserFamily>Blink</browserFamily>
 		<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
+		<browserName>Chrome 33.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserCode>CH</browserCode>
+		<browserVersion>33.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -725,14 +733,6 @@
 		<location>San Francisco, California, United States</location>
 		<latitude>37.792000</latitude>
 		<longitude>-122.408997</longitude>
-		<operatingSystem>Mac OS</operatingSystem>
-		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemShortName>Mac OS</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
-		<browserName>Chrome 33.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
-		<browserCode>CH</browserCode>
-		<browserVersion>33.0</browserVersion>
 		<screenType>wide</screenType>
 		<resolution>1360x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
@@ -833,8 +833,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Mac</operatingSystem>
+		<operatingSystemCode>MAC</operatingSystemCode>
+		<operatingSystemShortName>Mac</operatingSystemShortName>
+		<operatingSystemIcon>MAC</operatingSystemIcon>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>Safari 7.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+		<browserCode>SF</browserCode>
+		<browserVersion>7.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -858,14 +866,6 @@
 		<location>Nihon'odori, Kanagawa, Japan</location>
 		<latitude>35.450001</latitude>
 		<longitude>139.649994</longitude>
-		<operatingSystem>Mac OS</operatingSystem>
-		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemShortName>Mac OS</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
-		<browserName>Safari 7.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
-		<browserCode>SF</browserCode>
-		<browserVersion>7.0</browserVersion>
 		<screenType>wide</screenType>
 		<resolution>2560x1440</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
@@ -955,8 +955,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Unknown</deviceType>
+		<operatingSystem>Android</operatingSystem>
+		<operatingSystemCode>AND</operatingSystemCode>
+		<operatingSystemShortName>Android</operatingSystemShortName>
+		<operatingSystemIcon>AND</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 27.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>27.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -980,14 +988,6 @@
 		<location>Weilerswist, Nordrhein-Westfalen, Germany</location>
 		<latitude>50.766998</latitude>
 		<longitude>6.833000</longitude>
-		<operatingSystem>Android</operatingSystem>
-		<operatingSystemCode>AND</operatingSystemCode>
-		<operatingSystemShortName>Android</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon>
-		<browserName>Firefox 27.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>27.0</browserVersion>
 		<screenType>mobile</screenType>
 		<resolution>360x640</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/mobile.gif</screenTypeIcon>
@@ -1069,8 +1069,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows 7</operatingSystem>
+		<operatingSystemCode>WI7</operatingSystemCode>
+		<operatingSystemShortName>Win 7</operatingSystemShortName>
+		<operatingSystemIcon>WI7</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 27.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>27.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -1094,14 +1102,6 @@
 		<location>Mainz, Rheinland-Pfalz, Germany</location>
 		<latitude>50</latitude>
 		<longitude>8.271000</longitude>
-		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemShortName>Win 7</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
-		<browserName>Firefox 27.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>27.0</browserVersion>
 		<screenType>wide</screenType>
 		<resolution>2560x1440</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
@@ -1238,8 +1238,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows 8</operatingSystem>
+		<operatingSystemCode>WI8</operatingSystemCode>
+		<operatingSystemShortName>Win 8</operatingSystemShortName>
+		<operatingSystemIcon>WI8</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 27.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>27.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -1263,14 +1271,6 @@
 		<location>Moscow, Moscow City, Russian Federation</location>
 		<latitude>55.751999</latitude>
 		<longitude>37.616001</longitude>
-		<operatingSystem>Windows 8</operatingSystem>
-		<operatingSystemCode>WI8</operatingSystemCode>
-		<operatingSystemShortName>Win 8</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI8.gif</operatingSystemIcon>
-		<browserName>Firefox 27.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>27.0</browserVersion>
 		<screenType>wide</screenType>
 		<resolution>1920x1080</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
@@ -1356,8 +1356,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows 7</operatingSystem>
+		<operatingSystemCode>WI7</operatingSystemCode>
+		<operatingSystemShortName>Win 7</operatingSystemShortName>
+		<operatingSystemIcon>WI7</operatingSystemIcon>
 		<browserFamily>Blink</browserFamily>
 		<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
+		<browserName>Chrome 33.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserCode>CH</browserCode>
+		<browserVersion>33.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -1381,14 +1389,6 @@
 		<location>Esentepe, Rize, Turkey</location>
 		<latitude>40.979000</latitude>
 		<longitude>40.415001</longitude>
-		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemShortName>Win 7</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
-		<browserName>Chrome 33.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
-		<browserCode>CH</browserCode>
-		<browserVersion>33.0</browserVersion>
 		<screenType>wide</screenType>
 		<resolution>1366x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
@@ -1482,8 +1482,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows 7</operatingSystem>
+		<operatingSystemCode>WI7</operatingSystemCode>
+		<operatingSystemShortName>Win 7</operatingSystemShortName>
+		<operatingSystemIcon>WI7</operatingSystemIcon>
 		<browserFamily>Blink</browserFamily>
 		<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
+		<browserName>Chrome 33.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserCode>CH</browserCode>
+		<browserVersion>33.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -1507,14 +1515,6 @@
 		<location>Maaseik, Limburg, Belgium</location>
 		<latitude>51.099998</latitude>
 		<longitude>5.800000</longitude>
-		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemShortName>Win 7</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
-		<browserName>Chrome 33.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
-		<browserCode>CH</browserCode>
-		<browserVersion>33.0</browserVersion>
 		<screenType>wide</screenType>
 		<resolution>1920x1080</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
@@ -1766,8 +1766,16 @@
 		<customVariables>
 		</customVariables>
 		<deviceType>Unknown</deviceType>
+		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemCode>UNK</operatingSystemCode>
+		<operatingSystemShortName>Unknown</operatingSystemShortName>
+		<operatingSystemIcon>UNK</operatingSystemIcon>
 		<browserFamily />
 		<browserFamilyDescription>Unknown</browserFamilyDescription>
+		<browserName>Unknown</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserCode>UNK</browserCode>
+		<browserVersion />
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -1791,14 +1799,6 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<operatingSystem>Unknown</operatingSystem>
-		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemShortName>Unknown</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
-		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
-		<browserCode>UNK</browserCode>
-		<browserVersion />
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -1882,8 +1882,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Trident</browserFamily>
 		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
+		<browserName>Internet Explorer 6.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browserCode>IE</browserCode>
+		<browserVersion>6.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -1907,14 +1915,6 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Internet Explorer 6.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
-		<browserCode>IE</browserCode>
-		<browserVersion>6.0</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -1999,8 +1999,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>Chrome 11.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserCode>CH</browserCode>
+		<browserVersion>11.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -2024,14 +2032,6 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Chrome 11.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
-		<browserCode>CH</browserCode>
-		<browserVersion>11.0</browserVersion>
 		<screenType>wide</screenType>
 		<resolution>1280x800</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
@@ -2132,8 +2132,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Mac</operatingSystem>
+		<operatingSystemCode>MAC</operatingSystemCode>
+		<operatingSystemShortName>Mac</operatingSystemShortName>
+		<operatingSystemIcon>MAC</operatingSystemIcon>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>RockMelt 0.9</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserCode>RM</browserCode>
+		<browserVersion>0.9</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -2157,14 +2165,6 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<operatingSystem>Mac OS</operatingSystem>
-		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemShortName>Mac OS</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
-		<browserName>RockMelt 0.9</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
-		<browserCode>RM</browserCode>
-		<browserVersion>0.9</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -2257,8 +2257,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Mac</operatingSystem>
+		<operatingSystemCode>MAC</operatingSystemCode>
+		<operatingSystemShortName>Mac</operatingSystemShortName>
+		<operatingSystemIcon>MAC</operatingSystemIcon>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>RockMelt 0.9</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserCode>RM</browserCode>
+		<browserVersion>0.9</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -2282,14 +2290,6 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<operatingSystem>Mac OS</operatingSystem>
-		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemShortName>Mac OS</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
-		<browserName>RockMelt 0.9</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
-		<browserCode>RM</browserCode>
-		<browserVersion>0.9</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -2389,8 +2389,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Mac</operatingSystem>
+		<operatingSystemCode>MAC</operatingSystemCode>
+		<operatingSystemShortName>Mac</operatingSystemShortName>
+		<operatingSystemIcon>MAC</operatingSystemIcon>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>RockMelt 0.9</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserCode>RM</browserCode>
+		<browserVersion>0.9</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -2414,14 +2422,6 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<operatingSystem>Mac OS</operatingSystem>
-		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemShortName>Mac OS</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
-		<browserName>RockMelt 0.9</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
-		<browserCode>RM</browserCode>
-		<browserVersion>0.9</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -2497,8 +2497,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Unknown</deviceType>
+		<operatingSystem>Bot</operatingSystem>
+		<operatingSystemCode>BOT</operatingSystemCode>
+		<operatingSystemShortName>Bot</operatingSystemShortName>
+		<operatingSystemIcon>BOT</operatingSystemIcon>
 		<browserFamily />
 		<browserFamilyDescription>Unknown</browserFamilyDescription>
+		<browserName>Unknown</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserCode>UNK</browserCode>
+		<browserVersion />
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -2522,14 +2530,6 @@
 		<location>Ashburn, Virginia, United States</location>
 		<latitude>39.043999</latitude>
 		<longitude>-77.487999</longitude>
-		<operatingSystem>Bot</operatingSystem>
-		<operatingSystemCode>BOT</operatingSystemCode>
-		<operatingSystemShortName>BOT</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
-		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
-		<browserCode>UNK</browserCode>
-		<browserVersion />
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -2605,8 +2605,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows 7</operatingSystem>
+		<operatingSystemCode>WI7</operatingSystemCode>
+		<operatingSystemShortName>Win 7</operatingSystemShortName>
+		<operatingSystemIcon>WI7</operatingSystemIcon>
 		<browserFamily>Trident</browserFamily>
 		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
+		<browserName>Internet Explorer 9.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browserCode>IE</browserCode>
+		<browserVersion>9.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -2630,14 +2638,6 @@
 		<location>Ashburn, Virginia, United States</location>
 		<latitude>39.043999</latitude>
 		<longitude>-77.487999</longitude>
-		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemShortName>Win 7</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
-		<browserName>Internet Explorer 9.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
-		<browserCode>IE</browserCode>
-		<browserVersion>9.0</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -2703,8 +2703,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Unknown</deviceType>
+		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemCode>UNK</operatingSystemCode>
+		<operatingSystemShortName>Unknown</operatingSystemShortName>
+		<operatingSystemIcon>UNK</operatingSystemIcon>
 		<browserFamily />
 		<browserFamilyDescription>Unknown</browserFamilyDescription>
+		<browserName>Unknown</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserCode>UNK</browserCode>
+		<browserVersion />
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -2728,14 +2736,6 @@
 		<location>Australia</location>
 		<latitude>-27</latitude>
 		<longitude>133</longitude>
-		<operatingSystem>Unknown</operatingSystem>
-		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemShortName>Unknown</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
-		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
-		<browserCode>UNK</browserCode>
-		<browserVersion />
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -2811,8 +2811,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Smartphone</deviceType>
+		<operatingSystem>Android</operatingSystem>
+		<operatingSystemCode>AND</operatingSystemCode>
+		<operatingSystemShortName>Android</operatingSystemShortName>
+		<operatingSystemIcon>AND</operatingSystemIcon>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>Android Browser</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon>
+		<browserCode>AN</browserCode>
+		<browserVersion />
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -2836,14 +2844,6 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<operatingSystem>Android</operatingSystem>
-		<operatingSystemCode>AND</operatingSystemCode>
-		<operatingSystemShortName>Android</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon>
-		<browserName>Android Browser </browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon>
-		<browserCode>AN</browserCode>
-		<browserVersion />
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -2919,8 +2919,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Mac</operatingSystem>
+		<operatingSystemCode>MAC</operatingSystemCode>
+		<operatingSystemShortName>Mac</operatingSystemShortName>
+		<operatingSystemIcon>MAC</operatingSystemIcon>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>RockMelt 0.9</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserCode>RM</browserCode>
+		<browserVersion>0.9</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -2944,14 +2952,6 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<operatingSystem>Mac OS</operatingSystem>
-		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemShortName>Mac OS</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
-		<browserName>RockMelt 0.9</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
-		<browserCode>RM</browserCode>
-		<browserVersion>0.9</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -3023,8 +3023,16 @@
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows 7</operatingSystem>
+		<operatingSystemCode>WI7</operatingSystemCode>
+		<operatingSystemShortName>Win 7</operatingSystemShortName>
+		<operatingSystemIcon>WI7</operatingSystemIcon>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>Chrome 20.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserCode>CH</browserCode>
+		<browserVersion>20.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -3048,14 +3056,6 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemShortName>Win 7</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
-		<browserName>Chrome 20.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
-		<browserCode>CH</browserCode>
-		<browserVersion>20.0</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -3127,8 +3127,16 @@
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>GNU/Linux</operatingSystem>
+		<operatingSystemCode>LIN</operatingSystemCode>
+		<operatingSystemShortName>GNU/Linux</operatingSystemShortName>
+		<operatingSystemIcon>LIN</operatingSystemIcon>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>Epiphany 2.30</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
+		<browserCode>EP</browserCode>
+		<browserVersion>2.30</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -3152,14 +3160,6 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Linux</operatingSystem>
-		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemShortName>Linux</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
-		<browserName>Epiphany 2.30</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
-		<browserCode>EP</browserCode>
-		<browserVersion>2.30</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -3231,8 +3231,16 @@
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows 7</operatingSystem>
+		<operatingSystemCode>WI7</operatingSystemCode>
+		<operatingSystemShortName>Win 7</operatingSystemShortName>
+		<operatingSystemIcon>WI7</operatingSystemIcon>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>Chrome 20.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserCode>CH</browserCode>
+		<browserVersion>20.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -3256,14 +3264,6 @@
 		<location>Brazil</location>
 		<latitude>-10</latitude>
 		<longitude>-55</longitude>
-		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemShortName>Win 7</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
-		<browserName>Chrome 20.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
-		<browserCode>CH</browserCode>
-		<browserVersion>20.0</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -3335,8 +3335,16 @@
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>GNU/Linux</operatingSystem>
+		<operatingSystemCode>LIN</operatingSystemCode>
+		<operatingSystemShortName>GNU/Linux</operatingSystemShortName>
+		<operatingSystemIcon>LIN</operatingSystemIcon>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>Epiphany 2.30</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
+		<browserCode>EP</browserCode>
+		<browserVersion>2.30</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -3360,14 +3368,6 @@
 		<location>Brazil</location>
 		<latitude>-10</latitude>
 		<longitude>-55</longitude>
-		<operatingSystem>Linux</operatingSystem>
-		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemShortName>Linux</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
-		<browserName>Epiphany 2.30</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
-		<browserCode>EP</browserCode>
-		<browserVersion>2.30</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -3439,8 +3439,16 @@
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows 7</operatingSystem>
+		<operatingSystemCode>WI7</operatingSystemCode>
+		<operatingSystemShortName>Win 7</operatingSystemShortName>
+		<operatingSystemIcon>WI7</operatingSystemIcon>
 		<browserFamily>Trident</browserFamily>
 		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
+		<browserName>Internet Explorer 9.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browserCode>IE</browserCode>
+		<browserVersion>9.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -3464,14 +3472,6 @@
 		<location>Brazil</location>
 		<latitude>-10</latitude>
 		<longitude>-55</longitude>
-		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemShortName>Win 7</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
-		<browserName>Internet Explorer 9.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
-		<browserCode>IE</browserCode>
-		<browserVersion>9.0</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -3543,8 +3543,16 @@
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>GNU/Linux</operatingSystem>
+		<operatingSystemCode>LIN</operatingSystemCode>
+		<operatingSystemShortName>GNU/Linux</operatingSystemShortName>
+		<operatingSystemIcon>LIN</operatingSystemIcon>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>Epiphany 2.30</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
+		<browserCode>EP</browserCode>
+		<browserVersion>2.30</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -3568,14 +3576,6 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<operatingSystem>Linux</operatingSystem>
-		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemShortName>Linux</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
-		<browserName>Epiphany 2.30</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
-		<browserCode>EP</browserCode>
-		<browserVersion>2.30</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -3647,8 +3647,16 @@
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows 7</operatingSystem>
+		<operatingSystemCode>WI7</operatingSystemCode>
+		<operatingSystemShortName>Win 7</operatingSystemShortName>
+		<operatingSystemIcon>WI7</operatingSystemIcon>
 		<browserFamily>Trident</browserFamily>
 		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
+		<browserName>Internet Explorer 9.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browserCode>IE</browserCode>
+		<browserVersion>9.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -3672,14 +3680,6 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemShortName>Win 7</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
-		<browserName>Internet Explorer 9.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
-		<browserCode>IE</browserCode>
-		<browserVersion>9.0</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -3751,8 +3751,16 @@
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows 7</operatingSystem>
+		<operatingSystemCode>WI7</operatingSystemCode>
+		<operatingSystemShortName>Win 7</operatingSystemShortName>
+		<operatingSystemIcon>WI7</operatingSystemIcon>
 		<browserFamily>Trident</browserFamily>
 		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
+		<browserName>Internet Explorer 9.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browserCode>IE</browserCode>
+		<browserVersion>9.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -3776,14 +3784,6 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemShortName>Win 7</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
-		<browserName>Internet Explorer 9.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
-		<browserCode>IE</browserCode>
-		<browserVersion>9.0</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -3855,8 +3855,16 @@
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Mac</operatingSystem>
+		<operatingSystemCode>MAC</operatingSystemCode>
+		<operatingSystemShortName>Mac</operatingSystemShortName>
+		<operatingSystemIcon>MAC</operatingSystemIcon>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>Chrome 19.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserCode>CH</browserCode>
+		<browserVersion>19.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -3880,14 +3888,6 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Mac OS</operatingSystem>
-		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemShortName>Mac OS</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
-		<browserName>Chrome 19.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
-		<browserCode>CH</browserCode>
-		<browserVersion>19.0</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -3959,8 +3959,16 @@
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>GNU/Linux</operatingSystem>
+		<operatingSystemCode>LIN</operatingSystemCode>
+		<operatingSystemShortName>GNU/Linux</operatingSystemShortName>
+		<operatingSystemIcon>LIN</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 6.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>6.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -3984,14 +3992,6 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Linux</operatingSystem>
-		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemShortName>Linux</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
-		<browserName>Firefox 6.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>6.0</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -4063,8 +4063,16 @@
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>GNU/Linux</operatingSystem>
+		<operatingSystemCode>LIN</operatingSystemCode>
+		<operatingSystemShortName>GNU/Linux</operatingSystemShortName>
+		<operatingSystemIcon>LIN</operatingSystemIcon>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>Chrome 19.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserCode>CH</browserCode>
+		<browserVersion>19.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -4088,14 +4096,6 @@
 		<location>Ashburn, Virginia, United States</location>
 		<latitude>39.043999</latitude>
 		<longitude>-77.487999</longitude>
-		<operatingSystem>Linux</operatingSystem>
-		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemShortName>Linux</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
-		<browserName>Chrome 19.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
-		<browserCode>CH</browserCode>
-		<browserVersion>19.0</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -4167,8 +4167,16 @@
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>GNU/Linux</operatingSystem>
+		<operatingSystemCode>LIN</operatingSystemCode>
+		<operatingSystemShortName>GNU/Linux</operatingSystemShortName>
+		<operatingSystemIcon>LIN</operatingSystemIcon>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>Epiphany 2.30</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
+		<browserCode>EP</browserCode>
+		<browserVersion>2.30</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -4192,14 +4200,6 @@
 		<location>Ashburn, Virginia, United States</location>
 		<latitude>39.043999</latitude>
 		<longitude>-77.487999</longitude>
-		<operatingSystem>Linux</operatingSystem>
-		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemShortName>Linux</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
-		<browserName>Epiphany 2.30</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
-		<browserCode>EP</browserCode>
-		<browserVersion>2.30</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -4271,8 +4271,16 @@
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows 7</operatingSystem>
+		<operatingSystemCode>WI7</operatingSystemCode>
+		<operatingSystemShortName>Win 7</operatingSystemShortName>
+		<operatingSystemIcon>WI7</operatingSystemIcon>
 		<browserFamily>Trident</browserFamily>
 		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
+		<browserName>Internet Explorer 9.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browserCode>IE</browserCode>
+		<browserVersion>9.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -4296,14 +4304,6 @@
 		<location>Ashburn, Virginia, United States</location>
 		<latitude>39.043999</latitude>
 		<longitude>-77.487999</longitude>
-		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemShortName>Win 7</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
-		<browserName>Internet Explorer 9.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
-		<browserCode>IE</browserCode>
-		<browserVersion>9.0</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -4375,8 +4375,16 @@
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>GNU/Linux</operatingSystem>
+		<operatingSystemCode>LIN</operatingSystemCode>
+		<operatingSystemShortName>GNU/Linux</operatingSystemShortName>
+		<operatingSystemIcon>LIN</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 6.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>6.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -4400,14 +4408,6 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<operatingSystem>Linux</operatingSystem>
-		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemShortName>Linux</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
-		<browserName>Firefox 6.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>6.0</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -4479,8 +4479,16 @@
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>GNU/Linux</operatingSystem>
+		<operatingSystemCode>LIN</operatingSystemCode>
+		<operatingSystemShortName>GNU/Linux</operatingSystemShortName>
+		<operatingSystemIcon>LIN</operatingSystemIcon>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>Epiphany 2.30</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
+		<browserCode>EP</browserCode>
+		<browserVersion>2.30</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -4504,14 +4512,6 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<operatingSystem>Linux</operatingSystem>
-		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemShortName>Linux</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
-		<browserName>Epiphany 2.30</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
-		<browserCode>EP</browserCode>
-		<browserVersion>2.30</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -4583,8 +4583,16 @@
 		<customVariables>
 		</customVariables>
 		<deviceType>Smartphone</deviceType>
+		<operatingSystem>Android</operatingSystem>
+		<operatingSystemCode>AND</operatingSystemCode>
+		<operatingSystemShortName>Android</operatingSystemShortName>
+		<operatingSystemIcon>AND</operatingSystemIcon>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>Android Browser</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon>
+		<browserCode>AN</browserCode>
+		<browserVersion />
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -4608,14 +4616,6 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<operatingSystem>Android</operatingSystem>
-		<operatingSystemCode>AND</operatingSystemCode>
-		<operatingSystemShortName>Android</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon>
-		<browserName>Android Browser </browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon>
-		<browserCode>AN</browserCode>
-		<browserVersion />
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -4687,8 +4687,16 @@
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Mac</operatingSystem>
+		<operatingSystemCode>MAC</operatingSystemCode>
+		<operatingSystemShortName>Mac</operatingSystemShortName>
+		<operatingSystemIcon>MAC</operatingSystemIcon>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>RockMelt 0.9</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserCode>RM</browserCode>
+		<browserVersion>0.9</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -4712,14 +4720,6 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<operatingSystem>Mac OS</operatingSystem>
-		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemShortName>Mac OS</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
-		<browserName>RockMelt 0.9</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
-		<browserCode>RM</browserCode>
-		<browserVersion>0.9</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
index 99f2f8d770..446d719865 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
-		<label>Linux / Epiphany / unknown</label>
+		<label>GNU/Linux / Epiphany / unknown</label>
 		<nb_visits>5</nb_visits>
 		<nb_actions>5</nb_actions>
 		<max_actions>1</max_actions>
@@ -12,7 +12,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
-		<label>Mac OS / RockMelt / unknown</label>
+		<label>Mac / RockMelt / unknown</label>
 		<nb_visits>5</nb_visits>
 		<nb_actions>8</nb_actions>
 		<max_actions>3</max_actions>
@@ -45,7 +45,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
-		<label>Linux / Firefox / unknown</label>
+		<label>GNU/Linux / Firefox / unknown</label>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
 		<max_actions>1</max_actions>
@@ -78,7 +78,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
-		<label>Linux / Chrome / unknown</label>
+		<label>GNU/Linux / Chrome / unknown</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<max_actions>1</max_actions>
@@ -89,7 +89,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
-		<label>Mac OS / Chrome / unknown</label>
+		<label>Mac / Chrome / unknown</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<max_actions>1</max_actions>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getScreenType_month.xml
index 2048a44e64..2048a44e64 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getScreenType_month.xml
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
index 403004b58a..ffcc37a531 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
@@ -43,6 +43,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -56,8 +58,18 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -66,14 +78,15 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>Warwickshire</region>
+		<regionCode>P3</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Warwickshire, United Kingdom</location>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -88,25 +101,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>United Kingdom</country>
-		<countryCode>gb</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
-		<region>Warwickshire</region>
-		<regionCode>P3</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Warwickshire, United Kingdom</location>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -117,6 +114,9 @@
 				<customVariableValue5>Cvar5 value is 0</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -197,6 +197,8 @@
 		
 		
 		
+		<searches>1</searches>
+		<actions>3</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -210,8 +212,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>1</searches>
-		<actions>3</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -220,14 +232,15 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>Warwickshire</region>
+		<regionCode>P3</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Warwickshire, United Kingdom</location>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -242,25 +255,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>United Kingdom</country>
-		<countryCode>gb</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
-		<region>Warwickshire</region>
-		<regionCode>P3</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Warwickshire, United Kingdom</location>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -271,6 +268,9 @@
 				<customVariableValue5>Cvar5 value is 0</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -320,6 +320,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -333,8 +335,18 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -343,14 +355,15 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>France</country>
+		<countryCode>fr</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+		<region>Franche-Comte</region>
+		<regionCode>A6</regionCode>
+		<city>Besançon</city>
+		<location>Besançon, Franche-Comte, France</location>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -365,25 +378,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>France</country>
-		<countryCode>fr</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
-		<region>Franche-Comte</region>
-		<regionCode>A6</regionCode>
-		<city>Besançon</city>
-		<location>Besançon, Franche-Comte, France</location>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -394,6 +391,9 @@
 				<customVariableValue5>Cvar5 value is 0</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -474,6 +474,8 @@
 		
 		
 		
+		<searches>1</searches>
+		<actions>3</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -487,8 +489,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>1</searches>
-		<actions>3</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -497,14 +509,15 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>France</country>
+		<countryCode>fr</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+		<region>Franche-Comte</region>
+		<regionCode>A6</regionCode>
+		<city>Besançon</city>
+		<location>Besançon, Franche-Comte, France</location>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -519,25 +532,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>France</country>
-		<countryCode>fr</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
-		<region>Franche-Comte</region>
-		<regionCode>A6</regionCode>
-		<city>Besançon</city>
-		<location>Besançon, Franche-Comte, France</location>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -548,6 +545,9 @@
 				<customVariableValue5>Cvar5 value is 0</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -597,6 +597,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -610,8 +612,18 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -620,14 +632,15 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>Canada</country>
+		<countryCode>ca</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag>
+		<region>British Columbia</region>
+		<regionCode>BC</regionCode>
+		<city>Vancouver</city>
+		<location>Vancouver, British Columbia, Canada</location>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -642,25 +655,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>North America</continent>
-		<continentCode>amn</continentCode>
-		<country>Canada</country>
-		<countryCode>ca</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag>
-		<region>British Columbia</region>
-		<regionCode>BC</regionCode>
-		<city>Vancouver</city>
-		<location>Vancouver, British Columbia, Canada</location>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -671,6 +668,9 @@
 				<customVariableValue5>Cvar5 value is 0</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -751,6 +751,8 @@
 		
 		
 		
+		<searches>1</searches>
+		<actions>3</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -764,8 +766,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>1</searches>
-		<actions>3</actions>
+		<deviceType>Unknown</deviceType>
+		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemCode>UNK</operatingSystemCode>
+		<operatingSystemShortName>Unknown</operatingSystemShortName>
+		<operatingSystemIcon>UNK</operatingSystemIcon>
+		<browserFamily />
+		<browserFamilyDescription>Unknown</browserFamilyDescription>
+		<browserName>Unknown</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserCode>UNK</browserCode>
+		<browserVersion />
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -774,14 +786,15 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Unknown</operatingSystem>
-		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemShortName>Unknown</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
-		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
-		<browserCode>UNK</browserCode>
-		<browserVersion />
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>Canada</country>
+		<countryCode>ca</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag>
+		<region>British Columbia</region>
+		<regionCode>BC</regionCode>
+		<city>Vancouver</city>
+		<location>Vancouver, British Columbia, Canada</location>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -796,27 +809,14 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Unknown</deviceType>
-		<browserFamily />
-		<browserFamilyDescription>Unknown</browserFamilyDescription>
-		<events>1</events>
-		<continent>North America</continent>
-		<continentCode>amn</continentCode>
-		<country>Canada</country>
-		<countryCode>ca</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag>
-		<region>British Columbia</region>
-		<regionCode>BC</regionCode>
-		<city>Vancouver</city>
-		<location>Vancouver, British Columbia, Canada</location>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<customVariables>
+		</customVariables>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
-		<customVariables>
-		</customVariables>
 		
 		
 		
@@ -866,6 +866,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -879,8 +881,18 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -889,14 +901,15 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Italy</country>
+		<countryCode>it</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/it.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Italy</location>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -911,25 +924,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Italy</country>
-		<countryCode>it</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/it.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Italy</location>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -940,6 +937,9 @@
 				<customVariableValue5>Cvar5 value is 0</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
index 46e7e63638..f633d73d12 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
@@ -33,6 +33,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId>userid.email@example.org</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -46,8 +48,18 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>WebKit</browserFamily>
+		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>Safari</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+		<browserCode>SF</browserCode>
+		<browserVersion />
+		<events>0</events>
 		<referrerType>search</referrerType>
 		<referrerTypeName>Search Engines</referrerTypeName>
 		<referrerName>Google</referrerName>
@@ -56,14 +68,17 @@
 		<referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Safari </browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
-		<browserCode>SF</browserCode>
-		<browserVersion />
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>United States</country>
+		<countryCode>us</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
+		<region>California</region>
+		<regionCode>CA</regionCode>
+		<city>not a city</city>
+		<location>not a city, California, United States</location>
+		<latitude>1</latitude>
+		<longitude>2</longitude>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -78,29 +93,14 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>WebKit</browserFamily>
-		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
-		<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>California</region>
-		<regionCode>CA</regionCode>
-		<city>not a city</city>
-		<location>not a city, California, United States</location>
-		<latitude>1</latitude>
-		<longitude>2</longitude>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<customVariables>
+		</customVariables>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
-		<customVariables>
-		</customVariables>
 		
 		
 		
@@ -181,6 +181,8 @@
 		
 		
 		
+		<searches>1</searches>
+		<actions>3</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -194,8 +196,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>1</searches>
-		<actions>3</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -204,14 +216,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Unknown</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -226,27 +241,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Unknown</continent>
-		<continentCode>unk</continentCode>
-		<country>Unknown</country>
-		<countryCode>xx</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Unknown</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -257,6 +254,9 @@
 				<customVariableValue5>Cvar5 value is 8</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -306,6 +306,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -319,8 +321,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -329,14 +341,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Unknown</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -351,27 +366,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Unknown</continent>
-		<continentCode>unk</continentCode>
-		<country>Unknown</country>
-		<countryCode>xx</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Unknown</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -382,6 +379,9 @@
 				<customVariableValue5>Cvar5 value is 8</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -445,6 +445,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>2</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -458,8 +460,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>2</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -468,14 +480,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Macedonia, the Former Yugoslav Republic of</country>
+		<countryCode>mk</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
+		<region>Miravci</region>
+		<regionCode>66</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -490,27 +505,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Macedonia, the Former Yugoslav Republic of</country>
-		<countryCode>mk</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
-		<region>Miravci</region>
-		<regionCode>66</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -521,6 +518,9 @@
 				<customVariableValue5>Cvar5 value is 7</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -570,6 +570,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -583,8 +585,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -593,14 +605,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Macedonia, the Former Yugoslav Republic of</country>
+		<countryCode>mk</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
+		<region>Miravci</region>
+		<regionCode>66</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -615,27 +630,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Macedonia, the Former Yugoslav Republic of</country>
-		<countryCode>mk</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
-		<region>Miravci</region>
-		<regionCode>66</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -646,6 +643,9 @@
 				<customVariableValue5>Cvar5 value is 7</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -726,6 +726,8 @@
 		
 		
 		
+		<searches>1</searches>
+		<actions>3</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -739,8 +741,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>1</searches>
-		<actions>3</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -749,14 +761,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Russian Federation</country>
+		<countryCode>ru</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
+		<region>Saint Petersburg City</region>
+		<regionCode>66</regionCode>
+		<city>Hluboká nad Vltavou</city>
+		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -771,27 +786,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<regionCode>66</regionCode>
-		<city>Hluboká nad Vltavou</city>
-		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -802,6 +799,9 @@
 				<customVariableValue5>Cvar5 value is 6</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -851,6 +851,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -864,8 +866,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -874,14 +886,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Russian Federation</country>
+		<countryCode>ru</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
+		<region>Saint Petersburg City</region>
+		<regionCode>66</regionCode>
+		<city>Hluboká nad Vltavou</city>
+		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -896,27 +911,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<regionCode>66</regionCode>
-		<city>Hluboká nad Vltavou</city>
-		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -927,6 +924,9 @@
 				<customVariableValue5>Cvar5 value is 6</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
index aa243bc101..f84c828e38 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
@@ -74,6 +74,8 @@
 		
 		
 		
+		<searches>1</searches>
+		<actions>3</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -87,8 +89,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>1</searches>
-		<actions>3</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -97,14 +109,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Unknown</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -119,27 +134,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Unknown</continent>
-		<continentCode>unk</continentCode>
-		<country>Unknown</country>
-		<countryCode>xx</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Unknown</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -150,6 +147,9 @@
 				<customVariableValue5>Cvar5 value is 8</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -199,6 +199,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -212,8 +214,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -222,14 +234,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Unknown</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -244,27 +259,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Unknown</continent>
-		<continentCode>unk</continentCode>
-		<country>Unknown</country>
-		<countryCode>xx</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Unknown</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -275,6 +272,9 @@
 				<customVariableValue5>Cvar5 value is 8</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -355,6 +355,8 @@
 		
 		
 		
+		<searches>1</searches>
+		<actions>3</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -368,8 +370,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>1</searches>
-		<actions>3</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -378,14 +390,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Russian Federation</country>
+		<countryCode>ru</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
+		<region>Saint Petersburg City</region>
+		<regionCode>66</regionCode>
+		<city>Hluboká nad Vltavou</city>
+		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -400,27 +415,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<regionCode>66</regionCode>
-		<city>Hluboká nad Vltavou</city>
-		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -431,6 +428,9 @@
 				<customVariableValue5>Cvar5 value is 6</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -494,6 +494,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>2</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -507,8 +509,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>2</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -517,14 +529,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Macedonia, the Former Yugoslav Republic of</country>
+		<countryCode>mk</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
+		<region>Miravci</region>
+		<regionCode>66</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -539,27 +554,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Macedonia, the Former Yugoslav Republic of</country>
-		<countryCode>mk</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
-		<region>Miravci</region>
-		<regionCode>66</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -570,6 +567,9 @@
 				<customVariableValue5>Cvar5 value is 7</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -619,6 +619,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -632,8 +634,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -642,14 +654,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Macedonia, the Former Yugoslav Republic of</country>
+		<countryCode>mk</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
+		<region>Miravci</region>
+		<regionCode>66</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -664,27 +679,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Macedonia, the Former Yugoslav Republic of</country>
-		<countryCode>mk</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
-		<region>Miravci</region>
-		<regionCode>66</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -695,6 +692,9 @@
 				<customVariableValue5>Cvar5 value is 7</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -744,6 +744,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -757,8 +759,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -767,14 +779,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Russian Federation</country>
+		<countryCode>ru</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
+		<region>Saint Petersburg City</region>
+		<regionCode>66</regionCode>
+		<city>Hluboká nad Vltavou</city>
+		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -789,27 +804,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<regionCode>66</regionCode>
-		<city>Hluboká nad Vltavou</city>
-		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -820,6 +817,9 @@
 				<customVariableValue5>Cvar5 value is 6</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -859,6 +859,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId>userid.email@example.org</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -872,8 +874,18 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>WebKit</browserFamily>
+		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>Safari</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+		<browserCode>SF</browserCode>
+		<browserVersion />
+		<events>0</events>
 		<referrerType>search</referrerType>
 		<referrerTypeName>Search Engines</referrerTypeName>
 		<referrerName>Google</referrerName>
@@ -882,14 +894,17 @@
 		<referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Safari </browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
-		<browserCode>SF</browserCode>
-		<browserVersion />
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>United States</country>
+		<countryCode>us</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
+		<region>California</region>
+		<regionCode>CA</regionCode>
+		<city>not a city</city>
+		<location>not a city, California, United States</location>
+		<latitude>1</latitude>
+		<longitude>2</longitude>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -904,29 +919,14 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>WebKit</browserFamily>
-		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
-		<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>California</region>
-		<regionCode>CA</regionCode>
-		<city>not a city</city>
-		<location>not a city, California, United States</location>
-		<latitude>1</latitude>
-		<longitude>2</longitude>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<customVariables>
+		</customVariables>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
-		<customVariables>
-		</customVariables>
 		
 		
 		
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
index 46e7e63638..f633d73d12 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
@@ -33,6 +33,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId>userid.email@example.org</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -46,8 +48,18 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>WebKit</browserFamily>
+		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>Safari</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+		<browserCode>SF</browserCode>
+		<browserVersion />
+		<events>0</events>
 		<referrerType>search</referrerType>
 		<referrerTypeName>Search Engines</referrerTypeName>
 		<referrerName>Google</referrerName>
@@ -56,14 +68,17 @@
 		<referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Safari </browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
-		<browserCode>SF</browserCode>
-		<browserVersion />
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>United States</country>
+		<countryCode>us</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
+		<region>California</region>
+		<regionCode>CA</regionCode>
+		<city>not a city</city>
+		<location>not a city, California, United States</location>
+		<latitude>1</latitude>
+		<longitude>2</longitude>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -78,29 +93,14 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>WebKit</browserFamily>
-		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
-		<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>California</region>
-		<regionCode>CA</regionCode>
-		<city>not a city</city>
-		<location>not a city, California, United States</location>
-		<latitude>1</latitude>
-		<longitude>2</longitude>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<customVariables>
+		</customVariables>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
-		<customVariables>
-		</customVariables>
 		
 		
 		
@@ -181,6 +181,8 @@
 		
 		
 		
+		<searches>1</searches>
+		<actions>3</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -194,8 +196,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>1</searches>
-		<actions>3</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -204,14 +216,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Unknown</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -226,27 +241,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Unknown</continent>
-		<continentCode>unk</continentCode>
-		<country>Unknown</country>
-		<countryCode>xx</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Unknown</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -257,6 +254,9 @@
 				<customVariableValue5>Cvar5 value is 8</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -306,6 +306,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -319,8 +321,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -329,14 +341,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Unknown</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -351,27 +366,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Unknown</continent>
-		<continentCode>unk</continentCode>
-		<country>Unknown</country>
-		<countryCode>xx</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Unknown</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -382,6 +379,9 @@
 				<customVariableValue5>Cvar5 value is 8</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -445,6 +445,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>2</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -458,8 +460,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>2</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -468,14 +480,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Macedonia, the Former Yugoslav Republic of</country>
+		<countryCode>mk</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
+		<region>Miravci</region>
+		<regionCode>66</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -490,27 +505,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Macedonia, the Former Yugoslav Republic of</country>
-		<countryCode>mk</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
-		<region>Miravci</region>
-		<regionCode>66</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -521,6 +518,9 @@
 				<customVariableValue5>Cvar5 value is 7</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -570,6 +570,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -583,8 +585,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -593,14 +605,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Macedonia, the Former Yugoslav Republic of</country>
+		<countryCode>mk</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
+		<region>Miravci</region>
+		<regionCode>66</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -615,27 +630,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Macedonia, the Former Yugoslav Republic of</country>
-		<countryCode>mk</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
-		<region>Miravci</region>
-		<regionCode>66</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -646,6 +643,9 @@
 				<customVariableValue5>Cvar5 value is 7</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -726,6 +726,8 @@
 		
 		
 		
+		<searches>1</searches>
+		<actions>3</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -739,8 +741,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>1</searches>
-		<actions>3</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -749,14 +761,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Russian Federation</country>
+		<countryCode>ru</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
+		<region>Saint Petersburg City</region>
+		<regionCode>66</regionCode>
+		<city>Hluboká nad Vltavou</city>
+		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -771,27 +786,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<regionCode>66</regionCode>
-		<city>Hluboká nad Vltavou</city>
-		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -802,6 +799,9 @@
 				<customVariableValue5>Cvar5 value is 6</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -851,6 +851,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -864,8 +866,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -874,14 +886,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Russian Federation</country>
+		<countryCode>ru</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
+		<region>Saint Petersburg City</region>
+		<regionCode>66</regionCode>
+		<city>Hluboká nad Vltavou</city>
+		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -896,27 +911,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<regionCode>66</regionCode>
-		<city>Hluboká nad Vltavou</city>
-		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -927,6 +924,9 @@
 				<customVariableValue5>Cvar5 value is 6</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
index 51741a69bc..72b7d353f7 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
@@ -33,6 +33,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId>userid.email@example.org</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -46,8 +48,18 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>WebKit</browserFamily>
+		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browserName>Safari</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+		<browserCode>SF</browserCode>
+		<browserVersion />
+		<events>0</events>
 		<referrerType>search</referrerType>
 		<referrerTypeName>Search Engines</referrerTypeName>
 		<referrerName>Google</referrerName>
@@ -56,14 +68,17 @@
 		<referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Safari </browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
-		<browserCode>SF</browserCode>
-		<browserVersion />
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>United States</country>
+		<countryCode>us</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
+		<region>California</region>
+		<regionCode>CA</regionCode>
+		<city>not a city</city>
+		<location>not a city, California, United States</location>
+		<latitude>1</latitude>
+		<longitude>2</longitude>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -78,29 +93,14 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>WebKit</browserFamily>
-		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
-		<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>California</region>
-		<regionCode>CA</regionCode>
-		<city>not a city</city>
-		<location>not a city, California, United States</location>
-		<latitude>1</latitude>
-		<longitude>2</longitude>
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<customVariables>
+		</customVariables>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
-		<customVariables>
-		</customVariables>
 		
 		
 		
@@ -181,6 +181,8 @@
 		
 		
 		
+		<searches>1</searches>
+		<actions>3</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -194,8 +196,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>1</searches>
-		<actions>3</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -204,14 +216,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Unknown</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -226,27 +241,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Unknown</continent>
-		<continentCode>unk</continentCode>
-		<country>Unknown</country>
-		<countryCode>xx</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Unknown</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -257,6 +254,9 @@
 				<customVariableValue5>Cvar5 value is 8</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -306,6 +306,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -319,8 +321,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -329,14 +341,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Unknown</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -351,27 +366,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Unknown</continent>
-		<continentCode>unk</continentCode>
-		<country>Unknown</country>
-		<countryCode>xx</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Unknown</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -382,6 +379,9 @@
 				<customVariableValue5>Cvar5 value is 8</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -445,6 +445,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>2</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -458,8 +460,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>2</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -468,14 +480,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Macedonia, the Former Yugoslav Republic of</country>
+		<countryCode>mk</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
+		<region>Miravci</region>
+		<regionCode>66</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -490,27 +505,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Macedonia, the Former Yugoslav Republic of</country>
-		<countryCode>mk</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
-		<region>Miravci</region>
-		<regionCode>66</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -521,6 +518,9 @@
 				<customVariableValue5>Cvar5 value is 7</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -570,6 +570,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -583,8 +585,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -593,14 +605,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Macedonia, the Former Yugoslav Republic of</country>
+		<countryCode>mk</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
+		<region>Miravci</region>
+		<regionCode>66</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -615,27 +630,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Macedonia, the Former Yugoslav Republic of</country>
-		<countryCode>mk</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
-		<region>Miravci</region>
-		<regionCode>66</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -646,6 +643,9 @@
 				<customVariableValue5>Cvar5 value is 7</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -726,6 +726,8 @@
 		
 		
 		
+		<searches>1</searches>
+		<actions>3</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -739,8 +741,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>1</searches>
-		<actions>3</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -749,14 +761,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Russian Federation</country>
+		<countryCode>ru</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
+		<region>Saint Petersburg City</region>
+		<regionCode>66</regionCode>
+		<city>Hluboká nad Vltavou</city>
+		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -771,27 +786,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<regionCode>66</regionCode>
-		<city>Hluboká nad Vltavou</city>
-		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -802,6 +799,9 @@
 				<customVariableValue5>Cvar5 value is 6</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -851,6 +851,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -864,8 +866,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -874,14 +886,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Russian Federation</country>
+		<countryCode>ru</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
+		<region>Saint Petersburg City</region>
+		<regionCode>66</regionCode>
+		<city>Hluboká nad Vltavou</city>
+		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -896,27 +911,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<regionCode>66</regionCode>
-		<city>Hluboká nad Vltavou</city>
-		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -927,6 +924,9 @@
 				<customVariableValue5>Cvar5 value is 6</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -990,6 +990,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>2</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -1003,8 +1005,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>2</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -1013,14 +1025,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Russian Federation</country>
+		<countryCode>ru</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
+		<region>Saint Petersburg City</region>
+		<regionCode>66</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -1035,27 +1050,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<regionCode>66</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -1066,6 +1063,9 @@
 				<customVariableValue5>Cvar5 value is 5</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -1115,6 +1115,8 @@
 		
 		
 		
+		<searches>0</searches>
+		<actions>1</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -1128,8 +1130,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -1138,14 +1150,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>Russian Federation</country>
+		<countryCode>ru</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
+		<region>Saint Petersburg City</region>
+		<regionCode>66</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -1160,27 +1175,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<regionCode>66</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -1191,6 +1188,9 @@
 				<customVariableValue5>Cvar5 value is 5</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		
 		
 		
@@ -1271,6 +1271,8 @@
 		
 		
 		
+		<searches>1</searches>
+		<actions>3</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -1284,8 +1286,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<visitDuration>1261</visitDuration>
 		<visitDurationPretty>21 min 1s</visitDurationPretty>
-		<searches>1</searches>
-		<actions>3</actions>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>1</events>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -1294,14 +1306,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>Kent</region>
+		<regionCode>G5</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Kent, United Kingdom</location>
+		<latitude />
+		<longitude />
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -1316,27 +1331,9 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<deviceType>Desktop</deviceType>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<events>1</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>United Kingdom</country>
-		<countryCode>gb</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
-		<region>Kent</region>
-		<regionCode>G5</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Kent, United Kingdom</location>
-		<latitude />
-		<longitude />
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
-		<provider>awesomeisp.com</provider>
-		<providerName>Awesomeisp</providerName>
-		<providerUrl>http://www.awesomeisp.com/</providerUrl>
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
@@ -1347,6 +1344,9 @@
 				<customVariableValue5>Cvar5 value is 4</customVariableValue5>
 			</row>
 		</customVariables>
+		<provider>awesomeisp.com</provider>
+		<providerName>Awesomeisp</providerName>
+		<providerUrl>http://www.awesomeisp.com/</providerUrl>
 		
 		
 		
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml
index 84860eba92..84860eba92 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml
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 347eac465f..d1aae4191e 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml
@@ -11,4 +11,44 @@
 		<nb_visits_converted>2</nb_visits_converted>
 		<logo>plugins/DevicesDetection/images/screens/normal.gif</logo>
 	</row>
+	<row>
+		<label>Smartphone</label>
+		<nb_visits>0</nb_visits>
+		<logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
+	</row>
+	<row>
+		<label>Tablet</label>
+		<nb_visits>0</nb_visits>
+		<logo>plugins/DevicesDetection/images/screens/tablet.png</logo>
+	</row>
+	<row>
+		<label>Feature phone</label>
+		<nb_visits>0</nb_visits>
+		<logo>plugins/DevicesDetection/images/screens/mobile.gif</logo>
+	</row>
+	<row>
+		<label>Console</label>
+		<nb_visits>0</nb_visits>
+		<logo>plugins/DevicesDetection/images/screens/console.gif</logo>
+	</row>
+	<row>
+		<label>Tv</label>
+		<nb_visits>0</nb_visits>
+		<logo>plugins/DevicesDetection/images/screens/tv.png</logo>
+	</row>
+	<row>
+		<label>Car browser</label>
+		<nb_visits>0</nb_visits>
+		<logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo>
+	</row>
+	<row>
+		<label>Smart display</label>
+		<nb_visits>0</nb_visits>
+		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
+	</row>
+	<row>
+		<label>Camera</label>
+		<nb_visits>0</nb_visits>
+		<logo>plugins/DevicesDetection/images/screens/camera.png</logo>
+	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getWideScreen_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getScreenType_day.xml
index f1acb38cb9..f1acb38cb9 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getWideScreen_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getScreenType_day.xml
diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
index e38d88d7f5..a1d509f68c 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
@@ -46,8 +46,16 @@
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows Vista</operatingSystem>
+		<operatingSystemCode>WVI</operatingSystemCode>
+		<operatingSystemShortName>Win Vista</operatingSystemShortName>
+		<operatingSystemIcon>WVI</operatingSystemIcon>
 		<browserFamily>Trident</browserFamily>
 		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
+		<browserName>Internet Explorer 7.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browserCode>IE</browserCode>
+		<browserVersion>7.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -71,14 +79,6 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows Vista</operatingSystem>
-		<operatingSystemCode>WVI</operatingSystemCode>
-		<operatingSystemShortName>Win Vista</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon>
-		<browserName>Internet Explorer 7.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
-		<browserCode>IE</browserCode>
-		<browserVersion>7.0</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -139,8 +139,16 @@
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows Vista</operatingSystem>
+		<operatingSystemCode>WVI</operatingSystemCode>
+		<operatingSystemShortName>Win Vista</operatingSystemShortName>
+		<operatingSystemIcon>WVI</operatingSystemIcon>
 		<browserFamily>Trident</browserFamily>
 		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
+		<browserName>Internet Explorer 7.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browserCode>IE</browserCode>
+		<browserVersion>7.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -164,14 +172,6 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows Vista</operatingSystem>
-		<operatingSystemCode>WVI</operatingSystemCode>
-		<operatingSystemShortName>Win Vista</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon>
-		<browserName>Internet Explorer 7.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
-		<browserCode>IE</browserCode>
-		<browserVersion>7.0</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
@@ -232,8 +232,16 @@
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows Vista</operatingSystem>
+		<operatingSystemCode>WVI</operatingSystemCode>
+		<operatingSystemShortName>Win Vista</operatingSystemShortName>
+		<operatingSystemIcon>WVI</operatingSystemIcon>
 		<browserFamily>Trident</browserFamily>
 		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
+		<browserName>Internet Explorer 7.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browserCode>IE</browserCode>
+		<browserVersion>7.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -257,14 +265,6 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows Vista</operatingSystem>
-		<operatingSystemCode>WVI</operatingSystemCode>
-		<operatingSystemShortName>Win Vista</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon>
-		<browserName>Internet Explorer 7.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
-		<browserCode>IE</browserCode>
-		<browserVersion>7.0</browserVersion>
 		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
diff --git a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
index c828bbb0e6..45a300d2c8 100644
--- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
@@ -41,8 +41,16 @@
 		<customVariables>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -66,14 +74,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
index ed01b69d09..bf15c6292e 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
@@ -76,18 +76,6 @@ label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site
 800x300,9,41,0%,4.56,00:13:21,11.11%
 1024x768,1,2,0%,2,00:06:01,0%
 
-Visitor Browser
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Unknown,8,40,0%,5,00:15:01,0%
-Firefox,1,2,0%,2,00:06:01,0%
-Opera,1,1,0%,1,00:00:00,100%
-
-Browser Version
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Unknown,8,40,0%,5,00:15:01,0%
-Firefox 3.6,1,2,0%,2,00:06:01,0%
-Opera 9.63,1,1,0%,1,00:00:00,100%
-
 Browser Plugins
 label,nb_visits,nb_visits_percentage
 Cookie,10,100%
@@ -106,28 +94,12 @@ label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site
 Dual,9,41,0%,4.56,00:13:21,11.11%
 Normal,1,2,0%,2,00:06:01,0%
 
-Operating System
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Unknown,8,40,0%,5,00:15:01,0%
-Windows XP,2,3,0%,1.5,00:03:01,50%
-
 Visitor Configuration
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Unknown / Unknown / 800x300,8,40,0%,5,00:15:01,0%
 Windows XP / Firefox / 1024x768,1,2,0%,2,00:06:01,0%
 Windows XP / Opera / 800x300,1,1,0%,1,00:00:00,100%
 
-Operating system family
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Unknown,8,40,0%,5,00:15:01,0%
-Windows,2,3,0%,1.5,00:03:01,50%
-
-Mobile vs Desktop
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Unknown,8,40,0%,5,00:15:01,0%
-Desktop,2,3,0%,1.5,00:03:01,50%
-Mobile,0,0,0%,0,00:00:00,0%
-
 Browser language
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Unknown,8,40,0%,5,00:15:01,0%
@@ -334,6 +306,18 @@ Device brand
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Unknown,10,43,0%,4.3,00:12:37,10%
 
+Visitor Browser
+label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
+Unknown,8,40,0%,5,00:15:01,0%
+Firefox,1,2,0%,2,00:06:01,0%
+Opera,1,1,0%,1,00:00:00,100%
+
+Browser Version
+label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
+Unknown,8,40,0%,5,00:15:01,0%
+Firefox 3.6,1,2,0%,2,00:06:01,0%
+Opera 9.63,1,1,0%,1,00:00:00,100%
+
 Device model
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Unknown,10,43,0%,4.3,00:12:37,10%
@@ -348,18 +332,6 @@ label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site
 Unknown,8,40,0%,5,00:15:01,0%
 Windows XP,2,3,0%,1.5,00:03:01,50%
 
-Browser families
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Unknown,8,40,0%,5,00:15:01,0%
-Firefox,1,2,0%,2,00:06:01,0%
-Opera,1,1,0%,1,00:00:00,100%
-
-Browser versions
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Unknown,8,40,0%,5,00:15:01,0%
-Firefox 3.6,1,2,0%,2,00:06:01,0%
-Opera 9.63,1,1,0%,1,00:00:00,100%
-
 Browser engines
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Unknown,8,40,0%,5,00:15:01,0%
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
index 0d52d55825..560e7ebe33 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
@@ -50,46 +50,21 @@
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getBrowser" style="text-decoration:none; color: rgb(68,68,68);">
-                    Visitor Browser
-                </a>
-            </li>
-                    <li>
-                <a href="#UserSettings_getBrowserVersion" style="text-decoration:none; color: rgb(68,68,68);">
-                    Browser Version
-                </a>
-            </li>
-                    <li>
                 <a href="#UserSettings_getPlugin" style="text-decoration:none; color: rgb(68,68,68);">
                     Browser Plugins
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getWideScreen" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#UserSettings_getScreenType" style="text-decoration:none; color: rgb(68,68,68);">
                     Normal / Widescreen
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getOS" style="text-decoration:none; color: rgb(68,68,68);">
-                    Operating System
-                </a>
-            </li>
-                    <li>
                 <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);">
                     Visitor Configuration
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getOSFamily" style="text-decoration:none; color: rgb(68,68,68);">
-                    Operating system family
-                </a>
-            </li>
-                    <li>
-                <a href="#UserSettings_getMobileVsDesktop" style="text-decoration:none; color: rgb(68,68,68);">
-                    Mobile vs Desktop
-                </a>
-            </li>
-                    <li>
                 <a href="#UserSettings_getLanguage" style="text-decoration:none; color: rgb(68,68,68);">
                     Browser language
                 </a>
@@ -285,28 +260,28 @@
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);">
-                    Device model
+                <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: rgb(68,68,68);">
+                    Visitor Browser
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(68,68,68);">
-                    Operating System families
+                <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);">
+                    Browser Version
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: rgb(68,68,68);">
-                    Operating System versions
+                <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);">
+                    Device model
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getBrowserFamilies" style="text-decoration:none; color: rgb(68,68,68);">
-                    Browser families
+                <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(68,68,68);">
+                    Operating System families
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);">
-                    Browser versions
+                <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: rgb(68,68,68);">
+                    Operating System versions
                 </a>
             </li>
                     <li>
@@ -1988,242 +1963,6 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getBrowser" style="color: rgb(126,115,99); font-size: 11pt;">
-    Visitor Browser
-</h2>
-
-            <img alt=""
-                                    src="data:image/png;base64,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"
-                                height="200"
-                width="700"/>
-    
-            <br/>
-        <br/>
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Browser&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/UNK.gif'>
-                                        &nbsp;
-                                                                                                            Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                8
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                40
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:15:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
-                                        &nbsp;
-                                                                                                            Firefox                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:06:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/OP.gif'>
-                                        &nbsp;
-                                                                                                            Opera                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:00:00
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                100%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
-<h2 id="UserSettings_getBrowserVersion" style="color: rgb(126,115,99); font-size: 11pt;">
-    Browser Version
-</h2>
-
-            <img alt=""
-                                    src="data:image/png;base64,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"
-                                height="200"
-                width="700"/>
-    
-            <br/>
-        <br/>
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Browser version&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/UNK.gif'>
-                                        &nbsp;
-                                                                                                            Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                8
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                40
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:15:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
-                                        &nbsp;
-                                                                                                            Firefox 3.6                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:06:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/OP.gif'>
-                                        &nbsp;
-                                                                                                            Opera 9.63                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:00:00
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                100%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
 <h2 id="UserSettings_getPlugin" style="color: rgb(126,115,99); font-size: 11pt;">
     Browser Plugins
 </h2>
@@ -2385,7 +2124,7 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getWideScreen" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="UserSettings_getScreenType" style="color: rgb(126,115,99); font-size: 11pt;">
     Normal / Widescreen
 </h2>
 
@@ -2478,99 +2217,6 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getOS" style="color: rgb(126,115,99); font-size: 11pt;">
-    Operating System
-</h2>
-
-            <img alt=""
-                                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAIw0lEQVR4nO3dz4ucdx3A8W/sTjekSXYhFXU3kNAHsTmUpUQTxRJNDsEgCDmI7bkHPQrqwRL0Ur3Gf6AHQTEXAx4kKGKgWKToUkKQtIbBYLvTgAQ3aRKz2bTjYdInT5+ZPPvZ2dl5ntl9vQ5hfjzz7LdQ5vue7/M8Mzu63W4CAFjLp+oeAAAwGUQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ2bJcuygQ8OfLz6VQDQBKJh3NrtdvxZDQFAc0zVPYBJ9fPX/l565JWXv1i82263sywrRkDpLgBMFtEwpKvv3lpdXc3vtlqtpaWl+fn5NV/YXxL57VJn9J7KN+g9W9x4Y/8FALA+omF4d+/ezW/PzMx0Op1INBRVBEQa1BDWLQCokXMaNlFxbSAyx68rAhQDAGMmGurUq4rg2Y7r2hgARs7hieHt2rVr4zvpLRj0UiC4FBHcGABGSzQM6fSJrLO0tOZm+RGKyJWW8SWH5JwGAMZONAzpW8cOpHRggztZ18SvEgCol2ioU/9VlAMvoHjcxuMZJAD07Oh2u3WPAQCYAK6eAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAjx5U4D+A4lqJ2vQIUxi8x9oqGs9FblnQvGz6+5wpgF5z6HJ4BmUerQWKIBaBDFAE3m8ATQFIoB6hL8TUTRADRI8W1LQ8DYBM9pEA1AUzgHGRrOOQ0AQIiVhrLgcR0A2DKCc9+Obrc7riEBABPM4QkAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGh5rcXGx7iHAdtTpdDqdTt2jgO1ozYlPNAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACETNU9gEb79e//UfcQYNu5fft2Smn37v/WPRDYdq5fXz58uGoD0VDlt3/6Z91DAIDx+UHlsw5PAAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgJBxREOWZWP4KwDApho+GvpTQBwAwJaRFfQemap3QABAA2VZ1m63S3dHf3ii1yOlNul/tn+bUtEUX1u6Xf0nAIDNsCkrDcU8Kc33xcdL25SKZl1/ovhaAGAzbMqJkAOn8NLUvuY032638xWF0u3IywGAofVm3lxv2h3TOQ0WAwBggozpnIaB8qUCAGBCDR8NpQ5Ycy1hiG7ovSQ/HmG5AgBqtKHDE8UOiEznFRN/KSnEAQDUaOC8vKPb7dY3pEZbXFz82a/+XfcoAGB8zp89XfGs354AAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAiZqnsAjfbSqUN1DwG2nVu3Pkgp7d27p+6BwLaz1OlUbyAaqnz75LN1DwG2nU6nk1Kam5ureyCw7Swu3qnewOEJACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQvzKZZXVBx/VPQSG1JoSxAAjJhqqfOdHv6t7CAzp/NnTdQ8BYKvxaQwACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgJCpugcwJqsrtz/84D9P7Pl0Sql3ozU9ldLOuscFABNj9NGQZVm73R75bjdideX20h+/u3zlxuyhfctXbty9ce3i/fkvvfSLY8/s/rge0urKg9b07rpHCgDN9SgaSpN99d1xGjiSLMuK21SP7dby1c5fFudeOFx88G+/+f6lrzy9cPDM4QMPUkr7PnNopKOmKYr/qzQtZwEmywQcnuglQu/tvhgQwzXN3RvX8ts3p997/f3vvf5+Sin99Bt/aE2PbtA0Q3PaF2ALeBQN/XNz8W6+WemDfv8GxS0H7jx98r174A5H6l5Kade+gyml5Ss38kf/9/V7vRszK/tvTr836j9KI0gEgBEaZqWhNOWnvg/9adAnvOAOB8qrYog5YHXlwbu//HEqFMPF+/P5s71imFnZv97dAsB2M0w0DPfpLV9sGPjvEDuM+8nbz2ZHX3w4jLfPHZ25XNpg4eCZTR0ATeDYBMAGDYiG/L21dExh8wy3kBA8we3ipX9dnz3V2/SNd26m2VNvLqejM5fz1YWZlf3Hntnt0oktbOhlKgCKPhENAz/0j2cxoP88x/4xpMefCFnhzLnOV78wc+r5py68daf3yNGZy8efXNp1rZVSml242vlz687Xln1jw1ZlgQFgVAZ8I2TxHXa977bVbVFcuhjbMkbJZ5cv9G7MLlydXbiaUpp74fBTT8yOeRiMh2IAGKERXHJZuvYhXwqOXx9ffelEaXVhuGngwlt33njnZn537sRqfnvPkR/ufPpz690hk2JdX+kBQIVyNPS/peYLAwM3KD1bsWX/g8EDDWv+xWqvvjj36LVvnkspHX9yKfhaJp1EABihCfhypw06eeS5lFJK944vPLj4/MuXrr168a/z37zU6h2bSPe/vHf2836EAgDWtPWj4WM7W9Pp5JHnji+89uGJh79c1eO6CQCI2D7R8FBr2tWVADCMAVdPAAD0Ew0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAyVfcAGu382dN1DwEAmsJKAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQnZ0u926xwAATAArDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACPk/szH61ZrdgZQAAAAASUVORK5CYII="
-                                height="200"
-                width="700"/>
-    
-            <br/>
-        <br/>
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Operating system&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/UNK.gif'>
-                                        &nbsp;
-                                                                                                            Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                8
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                40
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:15:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WXP.gif'>
-                                        &nbsp;
-                                                                                                            Windows XP                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1.5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:03:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                50%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
 <h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;">
     Visitor Configuration
 </h2>
@@ -2683,217 +2329,6 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getOSFamily" style="color: rgb(126,115,99); font-size: 11pt;">
-    Operating system family
-</h2>
-
-            <img alt=""
-                                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAIp0lEQVR4nO3dQYhcdx3A8X/sTjekSXYhCrobaOlDbA5hKdFEUKLJIRgEIQexPfegR0EFlaKX6jWC5x4ExVwMeJCgSBeKRYouJRRJaxgabHeaIoubdBOz2dTx8KZvJ28ns7+d3Z03b+fzOYQ3b968/S+Eed/9v/dm9rXb7QQAsJlPVD0AAKAeRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDVFZlvVc2XN9/1cBQB2Jhu1qNpvxZzUEAPU1UfUARsXPX/57ac2PX/h898Nms5llWXcElB4CwN4mGjquv3t7bW2teNhoNBYXF2dnZzd94caSKJZLnZE/VWyQP9u98fZ+AwDYXaJh3d27d4vlqampVqsViYZufQIi9WoI8xYA1IhrGrage24gcozfUgQoBgBGnGjYSXlVBK923NLGAFA5pyfWHThwYPs7yScM8hQITkUENwaAaomGjgtns9bi4qabFWcoIndaxqcckmsaABh5oqHjG6efTOnJbe5kSwd+lQBAvYiGnbTxLsqeN1A8auPhDBIABrOv3W5XPQYAoAbcPQEAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQMhYf7uQzlGBk+WhUGBGRY+Xej4bSW5J3KBgdvuUVRkTwWOn0BFANBQ+1IxqACigGqKO9f3oCGDWKAUZN8DsURQNQge63Jw0BlQte0yAagGFzbTLUlGsaAICQvT/TEDxPAwBjK3is3Ndut4c1JACgxpyeAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIWMUDQsLC1UPAVjXarVarVbVowDWbXqgHKNoAAC2QzQAACGiAQAIEQ0AQIhoAABCRAMAECIaAICQiaoHMFS/+cM/qh4C0LGyspJSOnjwP1UPBOi4eXP5xIl+G4xXNPzuz/+seggAMLq+1/dZpycAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAyCDRkGXZjo8DABhx69GwMQXEAQCMraxLvmai2gEBACMoy7Jms1l6uPnpibwvSq2x8dmN25QKpfu1peX+PwIAGAWhmYbu3Cgd77vXl7YpFcqWfkT3awGAURC6ELLnIbx0aN/0MN9sNosZhdJy5OUAwNDkR+pCfpge8JoGkwEAsIcNeE1DT8VUAQAwJtajodQBm84lDNAN+UuK8xGmKwCgRh46PdHdAZHDeZ8DfykpxAEA1EjP4/i+drtd3ZCGamFh4We//lfVowCA0XX54oU+z/ruCQAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAkImqBzBUz58/VvUQgI7btz9MKR0+fKjqgQAdi61W/w3GKxq+ee6ZqocAdLRarZTSzMxM1QMBOhYW7vTfwOkJACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQsbrWy7XHvyv6iGwAxoTYhegAuMVDd/6we+rHgI74PLFC1UPAWAc+YsNAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAICQiaoHMIi11ZWPPvz3Y4c+lVLKFxqTEyntr3pcALCX7Uo0ZFnWbDZ3Y88ppbXVlcU/fXv52tL0sSPL15buLt2Yvz/7hed/cfrpgx/XQ1pbfdCYPLhLAwCA8fTQ6Yksy+IPq3J7+XrrLwvTx450r/zbb7/7y1d+OH/1naUPri19cC1PB/a8rEvVYwHY++p9cL27dKNYvjX53qvvf+fV91NK6adf+2NjsqpBMSSlCa1dnd8CIJWiodlsFu+8+UL3w2Kz4qniVekR8xDdK7v3lh5+i++5w0e4l1I6cOSplNLytaVi7X+/ei9fmFo9emvyvU1/bfYAiQAwZAPONJQO+enhd/B8zcY/BIM77GNt9cG7v/pR6iqG+fuzxbN5MUytHo3/IgBA0IDRMNgfecVkQ89/gzv5yVvPZKee6+zwrUunpt4sbTD31IsDjI1ac24CYAh6f05D8Ra8pcP5duQ/aNOfNX/1nZvT5/Pl196+dXP6/Ou3jqeUplaP5hMMU6tHTz990K0T4yP/b6MYAIagPNPQsxK2OhkwmO5rKR61zYuXWl/63NT5Z5+48sadfM2pqTfPPL544EYjpTQ9d731SuPOV5Z9YsOYkAsAw9R7pqH7jXirb8r926L7csjSpZED+PTylXxheu769Nz1lNLMl0888dj0wDukRhQDwJDtzC2XpXsfiksjS3dP9NlD7NaJjitv3Hnt7VvFw5mza8XyoZPf3//Jz2xl7NRYqVA1BMCu6hENG995i4mBnhuUnu2z5caV/bfc6KXnZtZf+/qllNKZxxcjL2TvkQgAQ1azD3c6d/J4Simle2fmHsw/+8LVGy/N/3X261cb+bmJdP+Lh6c/60soAGA31CwaPra/MZnOnTx+Zu7lj852vrkq574JANglNY2GjsakuysBYEh63z0BAFAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIGSi6gEM1eWLF6oeAgDUlZkGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACE7Gu321WPAQCoATMNAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAI+T9ZALt1tJCG/QAAAABJRU5ErkJggg=="
-                                height="200"
-                width="700"/>
-    
-            <br/>
-        <br/>
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Operating system family&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/UNK.gif'>
-                                        &nbsp;
-                                                                                                            Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                8
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                40
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:15:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WXP.gif'>
-                                        &nbsp;
-                                                                                                            Windows                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1.5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:03:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                50%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
-<h2 id="UserSettings_getMobileVsDesktop" style="color: rgb(126,115,99); font-size: 11pt;">
-    Mobile vs Desktop
-</h2>
-
-            <img alt=""
-                                    src="data:image/png;base64,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"
-                                height="200"
-                width="700"/>
-    
-            <br/>
-        <br/>
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Mobile vs Desktop&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/UNK.gif'>
-                                        &nbsp;
-                                                                                                            Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                8
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                40
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:15:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/screens/normal.gif'>
-                                        &nbsp;
-                                                                                                            Desktop                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1.5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:03:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                50%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/screens/mobile.gif'>
-                                        &nbsp;
-                                                                                                            Mobile                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:00:00
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
 <h2 id="UserSettings_getLanguage" style="color: rgb(126,115,99); font-size: 11pt;">
     Browser language
 </h2>
@@ -5336,12 +4771,12 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;">
-    Device model
+<h2 id="DevicesDetection_getBrowsers" style="color: rgb(126,115,99); font-size: 11pt;">
+    Visitor Browser
 </h2>
 
             <img alt=""
-                                    src="data:image/png;base64,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"
+                                    src="data:image/png;base64,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"
                                 height="200"
                 width="700"/>
     
@@ -5351,7 +4786,7 @@
             <table style="border-collapse:collapse; margin-left: 5px;">
             <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
                             <th style="padding: 6px 0;">
-                    &nbsp;Device model&nbsp;&nbsp;
+                    &nbsp;Browser&nbsp;&nbsp;
                 </th>
                             <th style="padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
@@ -5376,21 +4811,73 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                        Unknown                                                                                                                        </td>
+                                                                                                                                        <img src='plugins/UserSettings/images/browsers/UNK.gif'>
+                                        &nbsp;
+                                                                                                            Unknown                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                10
+                                                                                                8
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                43
+                                                                                                40
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                4.3
+                                                                                                5
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:12:37
+                                                                                                00:15:01
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                10%
+                                                                                                0%
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                0%
+                                                                                    </td>
+                                    </tr>
+                            
+                                                                    <tr style="background-color: rgb(249,250,250)">
+                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
+                                        &nbsp;
+                                                                                                            Firefox                                                                                                                        </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                1
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                2
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                2
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                00:06:01
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                0%
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                0%
+                                                                                    </td>
+                                    </tr>
+                            
+                                                                    <tr style="">
+                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/UserSettings/images/browsers/OP.gif'>
+                                        &nbsp;
+                                                                                                            Opera                                                                                                                        </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                1
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                1
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                1
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                00:00:00
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                100%
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 0%
@@ -5402,12 +4889,12 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getOsFamilies" style="color: rgb(126,115,99); font-size: 11pt;">
-    Operating System families
+<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;">
+    Browser Version
 </h2>
 
             <img alt=""
-                                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAIp0lEQVR4nO3dQYhcdx3A8X/sTjekSXYhCrobaOlDbA5hKdFEUKLJIRgEIQexPfegR0EFlaKX6jWC5x4ExVwMeJCgSBeKRYouJRRJaxgabHeaIoubdBOz2dTx8KZvJ28ns7+d3Z03b+fzOYQ3b968/S+Eed/9v/dm9rXb7QQAsJlPVD0AAKAeRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDVFZlvVc2XN9/1cBQB2Jhu1qNpvxZzUEAPU1UfUARsXPX/57ac2PX/h898Nms5llWXcElB4CwN4mGjquv3t7bW2teNhoNBYXF2dnZzd94caSKJZLnZE/VWyQP9u98fZ+AwDYXaJh3d27d4vlqampVqsViYZufQIi9WoI8xYA1IhrGrage24gcozfUgQoBgBGnGjYSXlVBK923NLGAFA5pyfWHThwYPs7yScM8hQITkUENwaAaomGjgtns9bi4qabFWcoIndaxqcckmsaABh5oqHjG6efTOnJbe5kSwd+lQBAvYiGnbTxLsqeN1A8auPhDBIABrOv3W5XPQYAoAbcPQEAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQMhYf7uQzlGBk+WhUGBGRY+Xej4bSW5J3KBgdvuUVRkTwWOn0BFANBQ+1IxqACigGqKO9f3oCGDWKAUZN8DsURQNQge63Jw0BlQte0yAagGFzbTLUlGsaAICQvT/TEDxPAwBjK3is3Ndut4c1JACgxpyeAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIWMUDQsLC1UPAVjXarVarVbVowDWbXqgHKNoAAC2QzQAACGiAQAIEQ0AQIhoAABCRAMAECIaAICQiaoHMFS/+cM/qh4C0LGyspJSOnjwP1UPBOi4eXP5xIl+G4xXNPzuz/+seggAMLq+1/dZpycAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAyCDRkGXZjo8DABhx69GwMQXEAQCMraxLvmai2gEBACMoy7Jms1l6uPnpibwvSq2x8dmN25QKpfu1peX+PwIAGAWhmYbu3Cgd77vXl7YpFcqWfkT3awGAURC6ELLnIbx0aN/0MN9sNosZhdJy5OUAwNDkR+pCfpge8JoGkwEAsIcNeE1DT8VUAQAwJtajodQBm84lDNAN+UuK8xGmKwCgRh46PdHdAZHDeZ8DfykpxAEA1EjP4/i+drtd3ZCGamFh4We//lfVowCA0XX54oU+z/ruCQAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAkImqBzBUz58/VvUQgI7btz9MKR0+fKjqgQAdi61W/w3GKxq+ee6ZqocAdLRarZTSzMxM1QMBOhYW7vTfwOkJACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQsbrWy7XHvyv6iGwAxoTYhegAuMVDd/6we+rHgI74PLFC1UPAWAc+YsNAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAICQiaoHMIi11ZWPPvz3Y4c+lVLKFxqTEyntr3pcALCX7Uo0ZFnWbDZ3Y88ppbXVlcU/fXv52tL0sSPL15buLt2Yvz/7hed/cfrpgx/XQ1pbfdCYPLhLAwCA8fTQ6Yksy+IPq3J7+XrrLwvTx450r/zbb7/7y1d+OH/1naUPri19cC1PB/a8rEvVYwHY++p9cL27dKNYvjX53qvvf+fV91NK6adf+2NjsqpBMSSlCa1dnd8CIJWiodlsFu+8+UL3w2Kz4qniVekR8xDdK7v3lh5+i++5w0e4l1I6cOSplNLytaVi7X+/ei9fmFo9emvyvU1/bfYAiQAwZAPONJQO+enhd/B8zcY/BIM77GNt9cG7v/pR6iqG+fuzxbN5MUytHo3/IgBA0IDRMNgfecVkQ89/gzv5yVvPZKee6+zwrUunpt4sbTD31IsDjI1ac24CYAh6f05D8Ra8pcP5duQ/aNOfNX/1nZvT5/Pl196+dXP6/Ou3jqeUplaP5hMMU6tHTz990K0T4yP/b6MYAIagPNPQsxK2OhkwmO5rKR61zYuXWl/63NT5Z5+48sadfM2pqTfPPL544EYjpTQ9d731SuPOV5Z9YsOYkAsAw9R7pqH7jXirb8r926L7csjSpZED+PTylXxheu769Nz1lNLMl0888dj0wDukRhQDwJDtzC2XpXsfiksjS3dP9NlD7NaJjitv3Hnt7VvFw5mza8XyoZPf3//Jz2xl7NRYqVA1BMCu6hENG995i4mBnhuUnu2z5caV/bfc6KXnZtZf+/qllNKZxxcjL2TvkQgAQ1azD3c6d/J4Simle2fmHsw/+8LVGy/N/3X261cb+bmJdP+Lh6c/60soAGA31CwaPra/MZnOnTx+Zu7lj852vrkq574JANglNY2GjsakuysBYEh63z0BAFAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIGSi6gEM1eWLF6oeAgDUlZkGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACE7Gu321WPAQCoATMNAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAI+T9ZALt1tJCG/QAAAABJRU5ErkJggg=="
+                                    src="data:image/png;base64,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"
                                 height="200"
                 width="700"/>
     
@@ -5417,7 +4904,7 @@
             <table style="border-collapse:collapse; margin-left: 5px;">
             <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
                             <th style="padding: 6px 0;">
-                    &nbsp;Operating System families&nbsp;&nbsp;
+                    &nbsp;Browser version&nbsp;&nbsp;
                 </th>
                             <th style="padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
@@ -5442,7 +4929,7 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/UNK.gif'>
+                                                                                                                                        <img src='plugins/UserSettings/images/browsers/UNK.gif'>
                                         &nbsp;
                                                                                                             Unknown                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -5467,23 +4954,48 @@
                             
                                                                     <tr style="background-color: rgb(249,250,250)">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WI7.gif'>
+                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
                                         &nbsp;
-                                                                                                            Windows                                                                                                                        </td>
+                                                                                                            Firefox 3.6                                                                                                                        </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                1
+                                                                                    </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3
+                                                                                                2
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1.5
+                                                                                                00:06:01
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:03:01
+                                                                                                0%
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                50%
+                                                                                                0%
+                                                                                    </td>
+                                    </tr>
+                            
+                                                                    <tr style="">
+                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/UserSettings/images/browsers/OP.gif'>
+                                        &nbsp;
+                                                                                                            Opera 9.63                                                                                                                        </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                1
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                1
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                1
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                00:00:00
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                100%
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 0%
@@ -5495,12 +5007,12 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getOsVersions" style="color: rgb(126,115,99); font-size: 11pt;">
-    Operating System versions
+<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;">
+    Device model
 </h2>
 
             <img alt=""
-                                    src="data:image/png;base64,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"
+                                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAF5UlEQVR4nO3du24jVQDHYRslTZo8gJG2GImGckF0W0CLkFJSUPEQSPTQ8gR0FFTb8BrrJ0BuIM4DsFIkSLRDYck7jJ3x3xPjuX1f5cuMc1I456czl8zLspwBABzyQdcDAACGQTQAABHRAABERAMAEBENAEBENAAAEdEAAESmFQ1FUex9ce/rzXsBwNRMKxqeslqt8nc1BADTdNH1AE7px5/f1F75/ttPqk9Xq1VRFNUIqD0FAJ4yqmj4/c+/Hh4etk8vLy/X6/VisTi4425JbB/XOmPz1naDzbvVjZ/3GwBAf40qGmaz2f39/fbx9fX13d1dEg1VDQEx29cQ1i0AmIjJndNQXRtI5vijIkAxADBik4uGgzZVEZ7teNTGADBoYzs8cXV19fwP2SwYbFIgXIoINwaA4RpVNNx8Xtyt1wc32x6hSK60zJccZs5pAGDURhUNX716MZu9eOaHHDXxqwQApmNU0XASu1dR7r2A4qmNzzNIADi/eVmWXY8BABgAV08AABHRAABERAMAEBENAEBENAAAEdEAAETcpwE4jd3bp7pzCYzMYKLBPZSg/3w3oc9q/0KhxcQ6jGio3a3ZzZsB4CibqXMbCu0m1mFEAzAIVgSht07ylRQNwGnU/iRZEYTxcfUEABARDQBARDQAp7F7ySUwMs5pAE6jemL2zImQMEbzsiy7HkPEHyMAaK22Ftiu8gcTDQBAt5zTAABERAMAEBENAEBENAAAEdEAAEREAwAQGVg0LJfLrocAHOB7Cv3X7ns6sGgAALoiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACIXXQ/gaH//89j1EIAmD4/vfE+h5x4e37XYa3jR8PV3v3U9BOCQX2+7HgFwwOvPPj12F4cnAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIi0iYaiKE4+DgCg595Hw24KiAMAmIKiKKqTflFR3ezi7AMDAHqkKIrVarXtg83T2rubx4cPT2w+ZW9xVN/d3abWKbWEqT5u/hEAwP+nmgjNopWGamXU5vvq67Vtap1y1I/IfwEA4DyiEyH3TuG1qf3gNL9d+qgug2w/RCUAQM+1vOTSYgAATE3LaKieMQEATMH7aKh1wMG1hBbdsNllezzCcgUADMh/ToSsdkAynTdM/LWkEAcA0E/Vyx5njTP4vCzLMw/uOZbL5Q+//NH1KABg8F7/dHPsLv73BAAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AACRi64HcLRvvvy46yEATW7X6w8Xi65HATS5Xa9b7DW8aLj54qOuhwA0WS7fvnzpewq9tly+bbGXwxMAQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAROZlWXY9BgBgAKw0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEDkX8OMamWUBte/AAAAAElFTkSuQmCC"
                                 height="200"
                 width="700"/>
     
@@ -5510,7 +5022,7 @@
             <table style="border-collapse:collapse; margin-left: 5px;">
             <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
                             <th style="padding: 6px 0;">
-                    &nbsp;Operating System versions&nbsp;&nbsp;
+                    &nbsp;Device model&nbsp;&nbsp;
                 </th>
                             <th style="padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
@@ -5535,48 +5047,21 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/UNK.gif'>
-                                        &nbsp;
-                                                                                                            Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                8
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                40
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:15:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WXP.gif'>
-                                        &nbsp;
-                                                                                                            Windows XP                                                                                                                        </td>
+                                                                                                                                                                        Unknown                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
+                                                                                                10
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3
+                                                                                                43
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1.5
+                                                                                                4.3
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:03:01
+                                                                                                00:12:37
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                50%
+                                                                                                10%
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 0%
@@ -5588,12 +5073,12 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getBrowserFamilies" style="color: rgb(126,115,99); font-size: 11pt;">
-    Browser families
+<h2 id="DevicesDetection_getOsFamilies" style="color: rgb(126,115,99); font-size: 11pt;">
+    Operating System families
 </h2>
 
             <img alt=""
-                                    src="data:image/png;base64,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"
+                                    src="data:image/png;base64,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"
                                 height="200"
                 width="700"/>
     
@@ -5603,7 +5088,7 @@
             <table style="border-collapse:collapse; margin-left: 5px;">
             <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
                             <th style="padding: 6px 0;">
-                    &nbsp;Browser families&nbsp;&nbsp;
+                    &nbsp;Operating system family&nbsp;&nbsp;
                 </th>
                             <th style="padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
@@ -5628,7 +5113,7 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/UNK.gif'>
+                                                                                                                                        <img src='plugins/UserSettings/images/os/UNK.gif'>
                                         &nbsp;
                                                                                                             Unknown                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -5653,48 +5138,23 @@
                             
                                                                     <tr style="background-color: rgb(249,250,250)">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
+                                                                                                                                        <img src='plugins/UserSettings/images/os/WI7.gif'>
                                         &nbsp;
-                                                                                                            Firefox                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
-                                                                                    </td>
+                                                                                                            Windows                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:06:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/OP.gif'>
-                                        &nbsp;
-                                                                                                            Opera                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
+                                                                                                3
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
+                                                                                                1.5
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:00:00
+                                                                                                00:03:01
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                100%
+                                                                                                50%
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 0%
@@ -5706,12 +5166,12 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;">
-    Browser versions
+<h2 id="DevicesDetection_getOsVersions" style="color: rgb(126,115,99); font-size: 11pt;">
+    Operating System versions
 </h2>
 
             <img alt=""
-                                    src="data:image/png;base64,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"
+                                    src="data:image/png;base64,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"
                                 height="200"
                 width="700"/>
     
@@ -5721,7 +5181,7 @@
             <table style="border-collapse:collapse; margin-left: 5px;">
             <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
                             <th style="padding: 6px 0;">
-                    &nbsp;Browser versions&nbsp;&nbsp;
+                    &nbsp;Operating System versions&nbsp;&nbsp;
                 </th>
                             <th style="padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
@@ -5746,7 +5206,7 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/UNK.gif'>
+                                                                                                                                        <img src='plugins/UserSettings/images/os/UNK.gif'>
                                         &nbsp;
                                                                                                             Unknown                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -5771,48 +5231,23 @@
                             
                                                                     <tr style="background-color: rgb(249,250,250)">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
+                                                                                                                                        <img src='plugins/UserSettings/images/os/WXP.gif'>
                                         &nbsp;
-                                                                                                            Firefox 3.6                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
-                                                                                    </td>
+                                                                                                            Windows XP                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:06:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/OP.gif'>
-                                        &nbsp;
-                                                                                                            Opera 9.63                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
+                                                                                                3
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
+                                                                                                1.5
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:00:00
+                                                                                                00:03:01
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                100%
+                                                                                                50%
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 0%
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
index 2a1c671ffd..4b376fdace 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
@@ -50,46 +50,21 @@
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getBrowser" style="text-decoration:none; color: rgb(68,68,68);">
-                    Visitor Browser
-                </a>
-            </li>
-                    <li>
-                <a href="#UserSettings_getBrowserVersion" style="text-decoration:none; color: rgb(68,68,68);">
-                    Browser Version
-                </a>
-            </li>
-                    <li>
                 <a href="#UserSettings_getPlugin" style="text-decoration:none; color: rgb(68,68,68);">
                     Browser Plugins
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getWideScreen" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#UserSettings_getScreenType" style="text-decoration:none; color: rgb(68,68,68);">
                     Normal / Widescreen
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getOS" style="text-decoration:none; color: rgb(68,68,68);">
-                    Operating System
-                </a>
-            </li>
-                    <li>
                 <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);">
                     Visitor Configuration
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getOSFamily" style="text-decoration:none; color: rgb(68,68,68);">
-                    Operating system family
-                </a>
-            </li>
-                    <li>
-                <a href="#UserSettings_getMobileVsDesktop" style="text-decoration:none; color: rgb(68,68,68);">
-                    Mobile vs Desktop
-                </a>
-            </li>
-                    <li>
                 <a href="#UserSettings_getLanguage" style="text-decoration:none; color: rgb(68,68,68);">
                     Browser language
                 </a>
@@ -285,28 +260,28 @@
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);">
-                    Device model
+                <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: rgb(68,68,68);">
+                    Visitor Browser
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(68,68,68);">
-                    Operating System families
+                <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);">
+                    Browser Version
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: rgb(68,68,68);">
-                    Operating System versions
+                <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);">
+                    Device model
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getBrowserFamilies" style="text-decoration:none; color: rgb(68,68,68);">
-                    Browser families
+                <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(68,68,68);">
+                    Operating System families
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);">
-                    Browser versions
+                <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: rgb(68,68,68);">
+                    Operating System versions
                 </a>
             </li>
                     <li>
@@ -1952,230 +1927,6 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getBrowser" style="color: rgb(126,115,99); font-size: 11pt;">
-    Visitor Browser
-</h2>
-
-    
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Browser&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/UNK.gif'>
-                                        &nbsp;
-                                                                                                            Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                8
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                40
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:15:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
-                                        &nbsp;
-                                                                                                            Firefox                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:06:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/OP.gif'>
-                                        &nbsp;
-                                                                                                            Opera                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:00:00
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                100%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
-<h2 id="UserSettings_getBrowserVersion" style="color: rgb(126,115,99); font-size: 11pt;">
-    Browser Version
-</h2>
-
-    
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Browser version&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/UNK.gif'>
-                                        &nbsp;
-                                                                                                            Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                8
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                40
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:15:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
-                                        &nbsp;
-                                                                                                            Firefox 3.6                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:06:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/OP.gif'>
-                                        &nbsp;
-                                                                                                            Opera 9.63                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:00:00
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                100%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
 <h2 id="UserSettings_getPlugin" style="color: rgb(126,115,99); font-size: 11pt;">
     Browser Plugins
 </h2>
@@ -2331,7 +2082,7 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getWideScreen" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="UserSettings_getScreenType" style="color: rgb(126,115,99); font-size: 11pt;">
     Normal / Widescreen
 </h2>
 
@@ -2418,93 +2169,6 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getOS" style="color: rgb(126,115,99); font-size: 11pt;">
-    Operating System
-</h2>
-
-    
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Operating system&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/UNK.gif'>
-                                        &nbsp;
-                                                                                                            Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                8
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                40
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:15:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WXP.gif'>
-                                        &nbsp;
-                                                                                                            Windows XP                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1.5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:03:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                50%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
 <h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;">
     Visitor Configuration
 </h2>
@@ -2611,205 +2275,6 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getOSFamily" style="color: rgb(126,115,99); font-size: 11pt;">
-    Operating system family
-</h2>
-
-    
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Operating system family&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/UNK.gif'>
-                                        &nbsp;
-                                                                                                            Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                8
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                40
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:15:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WXP.gif'>
-                                        &nbsp;
-                                                                                                            Windows                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1.5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:03:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                50%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
-<h2 id="UserSettings_getMobileVsDesktop" style="color: rgb(126,115,99); font-size: 11pt;">
-    Mobile vs Desktop
-</h2>
-
-    
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Mobile vs Desktop&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/UNK.gif'>
-                                        &nbsp;
-                                                                                                            Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                8
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                40
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:15:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/screens/normal.gif'>
-                                        &nbsp;
-                                                                                                            Desktop                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1.5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:03:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                50%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/screens/mobile.gif'>
-                                        &nbsp;
-                                                                                                            Mobile                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:00:00
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
 <h2 id="UserSettings_getLanguage" style="color: rgb(126,115,99); font-size: 11pt;">
     Browser language
 </h2>
@@ -5096,8 +4561,8 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;">
-    Device model
+<h2 id="DevicesDetection_getBrowsers" style="color: rgb(126,115,99); font-size: 11pt;">
+    Visitor Browser
 </h2>
 
     
@@ -5105,7 +4570,7 @@
             <table style="border-collapse:collapse; margin-left: 5px;">
             <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
                             <th style="padding: 6px 0;">
-                    &nbsp;Device model&nbsp;&nbsp;
+                    &nbsp;Browser&nbsp;&nbsp;
                 </th>
                             <th style="padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
@@ -5130,21 +4595,73 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                        Unknown                                                                                                                        </td>
+                                                                                                                                        <img src='plugins/UserSettings/images/browsers/UNK.gif'>
+                                        &nbsp;
+                                                                                                            Unknown                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                10
+                                                                                                8
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                43
+                                                                                                40
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                4.3
+                                                                                                5
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:12:37
+                                                                                                00:15:01
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                10%
+                                                                                                0%
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                0%
+                                                                                    </td>
+                                    </tr>
+                            
+                                                                    <tr style="background-color: rgb(249,250,250)">
+                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
+                                        &nbsp;
+                                                                                                            Firefox                                                                                                                        </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                1
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                2
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                2
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                00:06:01
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                0%
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                0%
+                                                                                    </td>
+                                    </tr>
+                            
+                                                                    <tr style="">
+                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/UserSettings/images/browsers/OP.gif'>
+                                        &nbsp;
+                                                                                                            Opera                                                                                                                        </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                1
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                1
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                1
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                00:00:00
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                100%
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 0%
@@ -5156,8 +4673,8 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getOsFamilies" style="color: rgb(126,115,99); font-size: 11pt;">
-    Operating System families
+<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;">
+    Browser Version
 </h2>
 
     
@@ -5165,7 +4682,7 @@
             <table style="border-collapse:collapse; margin-left: 5px;">
             <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
                             <th style="padding: 6px 0;">
-                    &nbsp;Operating System families&nbsp;&nbsp;
+                    &nbsp;Browser version&nbsp;&nbsp;
                 </th>
                             <th style="padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
@@ -5190,7 +4707,7 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/UNK.gif'>
+                                                                                                                                        <img src='plugins/UserSettings/images/browsers/UNK.gif'>
                                         &nbsp;
                                                                                                             Unknown                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -5215,23 +4732,48 @@
                             
                                                                     <tr style="background-color: rgb(249,250,250)">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WI7.gif'>
+                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
                                         &nbsp;
-                                                                                                            Windows                                                                                                                        </td>
+                                                                                                            Firefox 3.6                                                                                                                        </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                1
+                                                                                    </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3
+                                                                                                2
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1.5
+                                                                                                00:06:01
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:03:01
+                                                                                                0%
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                50%
+                                                                                                0%
+                                                                                    </td>
+                                    </tr>
+                            
+                                                                    <tr style="">
+                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/UserSettings/images/browsers/OP.gif'>
+                                        &nbsp;
+                                                                                                            Opera 9.63                                                                                                                        </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                1
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                1
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                1
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                00:00:00
+                                                                                    </td>
+                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                                                100%
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 0%
@@ -5243,8 +4785,8 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getOsVersions" style="color: rgb(126,115,99); font-size: 11pt;">
-    Operating System versions
+<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;">
+    Device model
 </h2>
 
     
@@ -5252,7 +4794,7 @@
             <table style="border-collapse:collapse; margin-left: 5px;">
             <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
                             <th style="padding: 6px 0;">
-                    &nbsp;Operating System versions&nbsp;&nbsp;
+                    &nbsp;Device model&nbsp;&nbsp;
                 </th>
                             <th style="padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
@@ -5277,48 +4819,21 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/UNK.gif'>
-                                        &nbsp;
-                                                                                                            Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                8
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                40
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:15:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WXP.gif'>
-                                        &nbsp;
-                                                                                                            Windows XP                                                                                                                        </td>
+                                                                                                                                                                        Unknown                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
+                                                                                                10
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3
+                                                                                                43
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1.5
+                                                                                                4.3
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:03:01
+                                                                                                00:12:37
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                50%
+                                                                                                10%
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 0%
@@ -5330,8 +4845,8 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getBrowserFamilies" style="color: rgb(126,115,99); font-size: 11pt;">
-    Browser families
+<h2 id="DevicesDetection_getOsFamilies" style="color: rgb(126,115,99); font-size: 11pt;">
+    Operating System families
 </h2>
 
     
@@ -5339,7 +4854,7 @@
             <table style="border-collapse:collapse; margin-left: 5px;">
             <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
                             <th style="padding: 6px 0;">
-                    &nbsp;Browser families&nbsp;&nbsp;
+                    &nbsp;Operating system family&nbsp;&nbsp;
                 </th>
                             <th style="padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
@@ -5364,7 +4879,7 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/UNK.gif'>
+                                                                                                                                        <img src='plugins/UserSettings/images/os/UNK.gif'>
                                         &nbsp;
                                                                                                             Unknown                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -5389,48 +4904,23 @@
                             
                                                                     <tr style="background-color: rgb(249,250,250)">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
+                                                                                                                                        <img src='plugins/UserSettings/images/os/WI7.gif'>
                                         &nbsp;
-                                                                                                            Firefox                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
-                                                                                    </td>
+                                                                                                            Windows                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:06:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/OP.gif'>
-                                        &nbsp;
-                                                                                                            Opera                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
+                                                                                                3
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
+                                                                                                1.5
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:00:00
+                                                                                                00:03:01
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                100%
+                                                                                                50%
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 0%
@@ -5442,8 +4932,8 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;">
-    Browser versions
+<h2 id="DevicesDetection_getOsVersions" style="color: rgb(126,115,99); font-size: 11pt;">
+    Operating System versions
 </h2>
 
     
@@ -5451,7 +4941,7 @@
             <table style="border-collapse:collapse; margin-left: 5px;">
             <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
                             <th style="padding: 6px 0;">
-                    &nbsp;Browser versions&nbsp;&nbsp;
+                    &nbsp;Operating System versions&nbsp;&nbsp;
                 </th>
                             <th style="padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
@@ -5476,7 +4966,7 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/UNK.gif'>
+                                                                                                                                        <img src='plugins/UserSettings/images/os/UNK.gif'>
                                         &nbsp;
                                                                                                             Unknown                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -5501,48 +4991,23 @@
                             
                                                                     <tr style="background-color: rgb(249,250,250)">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
+                                                                                                                                        <img src='plugins/UserSettings/images/os/WXP.gif'>
                                         &nbsp;
-                                                                                                            Firefox 3.6                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
-                                                                                    </td>
+                                                                                                            Windows XP                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:06:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/OP.gif'>
-                                        &nbsp;
-                                                                                                            Opera 9.63                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
+                                                                                                3
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
+                                                                                                1.5
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:00:00
+                                                                                                00:03:01
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                100%
+                                                                                                50%
                                                                                     </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 0%
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf
index 047dd073fd..a0fd96e026 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
index 35cca48347..6f338b56b1 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
@@ -213,63 +213,6 @@
 	</row>
 	<row>
 		<category>Visitor Settings</category>
-		<name>Visitor Browser</name>
-		<module>UserSettings</module>
-		<action>getBrowser</action>
-		<dimension>Browser</dimension>
-		<documentation>This report contains information about what kind of browser your visitors were using. Each browser version is listed separately.</documentation>
-		<metrics>
-			<nb_visits>Visits</nb_visits>
-			<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
-			<nb_actions>Actions</nb_actions>
-			<nb_users>Users</nb_users>
-		</metrics>
-		<metricsDocumentation>
-			<nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
-			<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
-			<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
-			<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
-		</metricsDocumentation>
-		<processedMetrics>
-			<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
-			<avg_time_on_site>Avg. Time on Website</avg_time_on_site>
-			<bounce_rate>Bounce Rate</bounce_rate>
-			<conversion_rate>Conversion Rate</conversion_rate>
-		</processedMetrics>
-		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getBrowser&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
-		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getBrowser&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
-		<uniqueId>UserSettings_getBrowser</uniqueId>
-	</row>
-	<row>
-		<category>Visitor Settings</category>
-		<name>Browser Version</name>
-		<module>UserSettings</module>
-		<action>getBrowserVersion</action>
-		<dimension>Browser version</dimension>
-		<metrics>
-			<nb_visits>Visits</nb_visits>
-			<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
-			<nb_actions>Actions</nb_actions>
-			<nb_users>Users</nb_users>
-		</metrics>
-		<metricsDocumentation>
-			<nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
-			<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
-			<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
-			<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
-		</metricsDocumentation>
-		<processedMetrics>
-			<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
-			<avg_time_on_site>Avg. Time on Website</avg_time_on_site>
-			<bounce_rate>Bounce Rate</bounce_rate>
-			<conversion_rate>Conversion Rate</conversion_rate>
-		</processedMetrics>
-		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getBrowserVersion&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
-		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getBrowserVersion&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
-		<uniqueId>UserSettings_getBrowserVersion</uniqueId>
-	</row>
-	<row>
-		<category>Visitor Settings</category>
 		<name>Browser Plugins</name>
 		<module>UserSettings</module>
 		<action>getPlugin</action>
@@ -290,7 +233,7 @@
 		<category>Visitor Settings</category>
 		<name>Normal / Widescreen</name>
 		<module>UserSettings</module>
-		<action>getWideScreen</action>
+		<action>getScreenType</action>
 		<dimension>Type of screen</dimension>
 		<metrics>
 			<nb_visits>Visits</nb_visits>
@@ -310,37 +253,9 @@
 			<bounce_rate>Bounce Rate</bounce_rate>
 			<conversion_rate>Conversion Rate</conversion_rate>
 		</processedMetrics>
-		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getWideScreen&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
-		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getWideScreen&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
-		<uniqueId>UserSettings_getWideScreen</uniqueId>
-	</row>
-	<row>
-		<category>Visitor Settings</category>
-		<name>Operating System</name>
-		<module>UserSettings</module>
-		<action>getOS</action>
-		<dimension>Operating system</dimension>
-		<metrics>
-			<nb_visits>Visits</nb_visits>
-			<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
-			<nb_actions>Actions</nb_actions>
-			<nb_users>Users</nb_users>
-		</metrics>
-		<metricsDocumentation>
-			<nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
-			<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
-			<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
-			<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
-		</metricsDocumentation>
-		<processedMetrics>
-			<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
-			<avg_time_on_site>Avg. Time on Website</avg_time_on_site>
-			<bounce_rate>Bounce Rate</bounce_rate>
-			<conversion_rate>Conversion Rate</conversion_rate>
-		</processedMetrics>
-		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getOS&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
-		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getOS&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
-		<uniqueId>UserSettings_getOS</uniqueId>
+		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getScreenType&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
+		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getScreenType&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
+		<uniqueId>UserSettings_getScreenType</uniqueId>
 	</row>
 	<row>
 		<category>Visitor Settings</category>
@@ -373,62 +288,6 @@
 	</row>
 	<row>
 		<category>Visitor Settings</category>
-		<name>Operating system family</name>
-		<module>UserSettings</module>
-		<action>getOSFamily</action>
-		<dimension>Operating system family</dimension>
-		<metrics>
-			<nb_visits>Visits</nb_visits>
-			<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
-			<nb_actions>Actions</nb_actions>
-			<nb_users>Users</nb_users>
-		</metrics>
-		<metricsDocumentation>
-			<nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
-			<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
-			<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
-			<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
-		</metricsDocumentation>
-		<processedMetrics>
-			<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
-			<avg_time_on_site>Avg. Time on Website</avg_time_on_site>
-			<bounce_rate>Bounce Rate</bounce_rate>
-			<conversion_rate>Conversion Rate</conversion_rate>
-		</processedMetrics>
-		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getOSFamily&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
-		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getOSFamily&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
-		<uniqueId>UserSettings_getOSFamily</uniqueId>
-	</row>
-	<row>
-		<category>Visitor Settings</category>
-		<name>Mobile vs Desktop</name>
-		<module>UserSettings</module>
-		<action>getMobileVsDesktop</action>
-		<dimension>Mobile vs Desktop</dimension>
-		<metrics>
-			<nb_visits>Visits</nb_visits>
-			<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
-			<nb_actions>Actions</nb_actions>
-			<nb_users>Users</nb_users>
-		</metrics>
-		<metricsDocumentation>
-			<nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
-			<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
-			<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
-			<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
-		</metricsDocumentation>
-		<processedMetrics>
-			<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
-			<avg_time_on_site>Avg. Time on Website</avg_time_on_site>
-			<bounce_rate>Bounce Rate</bounce_rate>
-			<conversion_rate>Conversion Rate</conversion_rate>
-		</processedMetrics>
-		<constantRowsCount>1</constantRowsCount>
-		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getMobileVsDesktop&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
-		<uniqueId>UserSettings_getMobileVsDesktop</uniqueId>
-	</row>
-	<row>
-		<category>Visitor Settings</category>
 		<name>Browser language</name>
 		<module>UserSettings</module>
 		<action>getLanguage</action>
@@ -1850,10 +1709,11 @@
 	</row>
 	<row>
 		<category>Visitor Devices</category>
-		<name>Device brand</name>
+		<name>Visitor Browser</name>
 		<module>DevicesDetection</module>
-		<action>getBrand</action>
-		<dimension>Device brand</dimension>
+		<action>getBrowsers</action>
+		<dimension>Browser</dimension>
+		<documentation>This report contains information about what kind of browser your visitors were using. Each browser version is listed separately.</documentation>
 		<metrics>
 			<nb_visits>Visits</nb_visits>
 			<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
@@ -1872,16 +1732,16 @@
 			<bounce_rate>Bounce Rate</bounce_rate>
 			<conversion_rate>Conversion Rate</conversion_rate>
 		</processedMetrics>
-		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrand&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
-		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrand&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
-		<uniqueId>DevicesDetection_getBrand</uniqueId>
+		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowsers&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
+		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowsers&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
+		<uniqueId>DevicesDetection_getBrowsers</uniqueId>
 	</row>
 	<row>
 		<category>Visitor Devices</category>
-		<name>Device model</name>
+		<name>Device brand</name>
 		<module>DevicesDetection</module>
-		<action>getModel</action>
-		<dimension>Device model</dimension>
+		<action>getBrand</action>
+		<dimension>Device brand</dimension>
 		<metrics>
 			<nb_visits>Visits</nb_visits>
 			<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
@@ -1900,16 +1760,16 @@
 			<bounce_rate>Bounce Rate</bounce_rate>
 			<conversion_rate>Conversion Rate</conversion_rate>
 		</processedMetrics>
-		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getModel&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
-		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getModel&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
-		<uniqueId>DevicesDetection_getModel</uniqueId>
+		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrand&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
+		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrand&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
+		<uniqueId>DevicesDetection_getBrand</uniqueId>
 	</row>
 	<row>
 		<category>Visitor Devices</category>
-		<name>Operating System families</name>
+		<name>Device model</name>
 		<module>DevicesDetection</module>
-		<action>getOsFamilies</action>
-		<dimension>Operating System families</dimension>
+		<action>getModel</action>
+		<dimension>Device model</dimension>
 		<metrics>
 			<nb_visits>Visits</nb_visits>
 			<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
@@ -1928,16 +1788,16 @@
 			<bounce_rate>Bounce Rate</bounce_rate>
 			<conversion_rate>Conversion Rate</conversion_rate>
 		</processedMetrics>
-		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getOsFamilies&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
-		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getOsFamilies&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
-		<uniqueId>DevicesDetection_getOsFamilies</uniqueId>
+		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getModel&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
+		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getModel&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
+		<uniqueId>DevicesDetection_getModel</uniqueId>
 	</row>
 	<row>
 		<category>Visitor Devices</category>
-		<name>Operating System versions</name>
+		<name>Browser Version</name>
 		<module>DevicesDetection</module>
-		<action>getOsVersions</action>
-		<dimension>Operating System versions</dimension>
+		<action>getBrowserVersions</action>
+		<dimension>Browser version</dimension>
 		<metrics>
 			<nb_visits>Visits</nb_visits>
 			<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
@@ -1956,16 +1816,16 @@
 			<bounce_rate>Bounce Rate</bounce_rate>
 			<conversion_rate>Conversion Rate</conversion_rate>
 		</processedMetrics>
-		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getOsVersions&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
-		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getOsVersions&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
-		<uniqueId>DevicesDetection_getOsVersions</uniqueId>
+		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowserVersions&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
+		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowserVersions&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
+		<uniqueId>DevicesDetection_getBrowserVersions</uniqueId>
 	</row>
 	<row>
 		<category>Visitor Devices</category>
-		<name>Browser families</name>
+		<name>Operating System families</name>
 		<module>DevicesDetection</module>
-		<action>getBrowserFamilies</action>
-		<dimension>Browser families</dimension>
+		<action>getOsFamilies</action>
+		<dimension>Operating system family</dimension>
 		<metrics>
 			<nb_visits>Visits</nb_visits>
 			<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
@@ -1984,16 +1844,16 @@
 			<bounce_rate>Bounce Rate</bounce_rate>
 			<conversion_rate>Conversion Rate</conversion_rate>
 		</processedMetrics>
-		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowserFamilies&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
-		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowserFamilies&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
-		<uniqueId>DevicesDetection_getBrowserFamilies</uniqueId>
+		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getOsFamilies&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
+		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getOsFamilies&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
+		<uniqueId>DevicesDetection_getOsFamilies</uniqueId>
 	</row>
 	<row>
 		<category>Visitor Devices</category>
-		<name>Browser versions</name>
+		<name>Operating System versions</name>
 		<module>DevicesDetection</module>
-		<action>getBrowserVersions</action>
-		<dimension>Browser versions</dimension>
+		<action>getOsVersions</action>
+		<dimension>Operating System versions</dimension>
 		<metrics>
 			<nb_visits>Visits</nb_visits>
 			<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
@@ -2012,9 +1872,9 @@
 			<bounce_rate>Bounce Rate</bounce_rate>
 			<conversion_rate>Conversion Rate</conversion_rate>
 		</processedMetrics>
-		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowserVersions&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
-		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowserVersions&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
-		<uniqueId>DevicesDetection_getBrowserVersions</uniqueId>
+		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getOsVersions&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
+		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getOsVersions&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
+		<uniqueId>DevicesDetection_getOsVersions</uniqueId>
 	</row>
 	<row>
 		<category>Visitor Devices</category>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
index 42b55ed358..2e0e34dbe1 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
@@ -79,8 +79,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -104,14 +112,6 @@
 		<location>Poland</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -290,8 +290,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -315,14 +323,6 @@
 		<location>Poland</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
index 2d178e632d..7456c3ccbb 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
@@ -155,8 +155,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -180,14 +188,6 @@
 		<location>Poland</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -485,8 +485,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -510,14 +518,6 @@
 		<location>Poland</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -701,8 +701,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -726,14 +734,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
index 69bb6fd4f6..2ee92aac5f 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
@@ -75,14 +75,6 @@ Screen Resolution
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 1024x768,5,16,80%,3.2,00:22:49,20%
 
-Visitor Browser
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Firefox,5,16,80%,3.2,00:22:49,20%
-
-Browser Version
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Firefox 3.6,5,16,80%,3.2,00:22:49,20%
-
 Browser Plugins
 label,nb_visits,nb_visits_percentage
 Cookie,5,100%
@@ -100,23 +92,10 @@ Normal / Widescreen
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Normal,5,16,80%,3.2,00:22:49,20%
 
-Operating System
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Windows XP,5,16,80%,3.2,00:22:49,20%
-
 Visitor Configuration
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Windows XP / Firefox / 1024x768,5,16,80%,3.2,00:22:49,20%
 
-Operating system family
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Windows,5,16,80%,3.2,00:22:49,20%
-
-Mobile vs Desktop
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Desktop,5,16,80%,3.2,00:22:49,20%
-Mobile,0,0,0%,0,00:00:00,0%
-
 Browser language
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Polish,4,12,75%,3,00:25:32,25%
@@ -484,6 +463,14 @@ Device brand
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Unknown,5,16,80%,3.2,00:22:49,20%
 
+Visitor Browser
+label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
+Firefox,5,16,80%,3.2,00:22:49,20%
+
+Browser Version
+label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
+Firefox 3.6,5,16,80%,3.2,00:22:49,20%
+
 Device model
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Unknown,5,16,80%,3.2,00:22:49,20%
@@ -496,14 +483,6 @@ Operating System versions
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Windows XP,5,16,80%,3.2,00:22:49,20%
 
-Browser families
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Firefox,5,16,80%,3.2,00:22:49,20%
-
-Browser versions
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Firefox 3.6,5,16,80%,3.2,00:22:49,20%
-
 Browser engines
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Gecko (Firefox),5,16,80%,3.2,00:22:49,20%
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
index f91034a651..7861e2ab4e 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
@@ -50,46 +50,21 @@
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getBrowser" style="text-decoration:none; color: rgb(68,68,68);">
-                    Visitor Browser
-                </a>
-            </li>
-                    <li>
-                <a href="#UserSettings_getBrowserVersion" style="text-decoration:none; color: rgb(68,68,68);">
-                    Browser Version
-                </a>
-            </li>
-                    <li>
                 <a href="#UserSettings_getPlugin" style="text-decoration:none; color: rgb(68,68,68);">
                     Browser Plugins
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getWideScreen" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#UserSettings_getScreenType" style="text-decoration:none; color: rgb(68,68,68);">
                     Normal / Widescreen
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getOS" style="text-decoration:none; color: rgb(68,68,68);">
-                    Operating System
-                </a>
-            </li>
-                    <li>
                 <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);">
                     Visitor Configuration
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getOSFamily" style="text-decoration:none; color: rgb(68,68,68);">
-                    Operating system family
-                </a>
-            </li>
-                    <li>
-                <a href="#UserSettings_getMobileVsDesktop" style="text-decoration:none; color: rgb(68,68,68);">
-                    Mobile vs Desktop
-                </a>
-            </li>
-                    <li>
                 <a href="#UserSettings_getLanguage" style="text-decoration:none; color: rgb(68,68,68);">
                     Browser language
                 </a>
@@ -345,28 +320,28 @@
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);">
-                    Device model
+                <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: rgb(68,68,68);">
+                    Visitor Browser
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(68,68,68);">
-                    Operating System families
+                <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);">
+                    Browser Version
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: rgb(68,68,68);">
-                    Operating System versions
+                <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);">
+                    Device model
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getBrowserFamilies" style="text-decoration:none; color: rgb(68,68,68);">
-                    Browser families
+                <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(68,68,68);">
+                    Operating System families
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);">
-                    Browser versions
+                <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: rgb(68,68,68);">
+                    Operating System versions
                 </a>
             </li>
                     <li>
@@ -2025,142 +2000,6 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getBrowser" style="color: rgb(126,115,99); font-size: 11pt;">
-    Visitor Browser
-</h2>
-
-            <img alt=""
-                                    src="data:image/png;base64,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"
-                                height="200"
-                width="700"/>
-    
-            <br/>
-        <br/>
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Browser&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
-                                        &nbsp;
-                                                                                                            Firefox                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                16
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3.2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:22:49
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                20%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                80%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
-<h2 id="UserSettings_getBrowserVersion" style="color: rgb(126,115,99); font-size: 11pt;">
-    Browser Version
-</h2>
-
-            <img alt=""
-                                    src="data:image/png;base64,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"
-                                height="200"
-                width="700"/>
-    
-            <br/>
-        <br/>
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Browser version&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
-                                        &nbsp;
-                                                                                                            Firefox 3.6                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                16
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3.2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:22:49
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                20%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                80%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
 <h2 id="UserSettings_getPlugin" style="color: rgb(126,115,99); font-size: 11pt;">
     Browser Plugins
 </h2>
@@ -2322,7 +2161,7 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getWideScreen" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="UserSettings_getScreenType" style="color: rgb(126,115,99); font-size: 11pt;">
     Normal / Widescreen
 </h2>
 
@@ -2390,74 +2229,6 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getOS" style="color: rgb(126,115,99); font-size: 11pt;">
-    Operating System
-</h2>
-
-            <img alt=""
-                                    src="data:image/png;base64,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"
-                                height="200"
-                width="700"/>
-    
-            <br/>
-        <br/>
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Operating system&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WXP.gif'>
-                                        &nbsp;
-                                                                                                            Windows XP                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                16
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3.2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:22:49
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                20%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                80%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
 <h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;">
     Visitor Configuration
 </h2>
@@ -2524,167 +2295,6 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getOSFamily" style="color: rgb(126,115,99); font-size: 11pt;">
-    Operating system family
-</h2>
-
-            <img alt=""
-                                    src="data:image/png;base64,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"
-                                height="200"
-                width="700"/>
-    
-            <br/>
-        <br/>
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Operating system family&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WXP.gif'>
-                                        &nbsp;
-                                                                                                            Windows                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                16
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3.2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:22:49
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                20%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                80%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
-<h2 id="UserSettings_getMobileVsDesktop" style="color: rgb(126,115,99); font-size: 11pt;">
-    Mobile vs Desktop
-</h2>
-
-            <img alt=""
-                                    src="data:image/png;base64,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"
-                                height="200"
-                width="700"/>
-    
-            <br/>
-        <br/>
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Mobile vs Desktop&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/screens/normal.gif'>
-                                        &nbsp;
-                                                                                                            Desktop                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                16
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3.2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:22:49
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                20%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                80%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/screens/mobile.gif'>
-                                        &nbsp;
-                                                                                                            Mobile                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:00:00
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
 <h2 id="UserSettings_getLanguage" style="color: rgb(126,115,99); font-size: 11pt;">
     Browser language
 </h2>
@@ -6925,12 +6535,12 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;">
-    Device model
+<h2 id="DevicesDetection_getBrowsers" style="color: rgb(126,115,99); font-size: 11pt;">
+    Visitor Browser
 </h2>
 
             <img alt=""
-                                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAF7UlEQVR4nO3dP24jVQDH8QmbNCuhKBVSAtpibkC2hYIDIOUAVPRItPQguj0BHfWegCPgE6BpgIwEEooEUigiMRQWZjJx4p8TO+M3/nwq/xk7b3c1O9+8N2MfdF1XAQCs8s7YAwAAyiAaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAi+xUNdV0vfXDp4w+/CgD2zX5Fw32apsmf1RAA7KfDsQewSd989+Pgka8+f92/2zRNXdf9CBjcBQDuM6lo+OmXP29ubhZ3j46OLi8vz87OVr7wbkksbg86Y/7UYoP5s/2Nn/YnAIDdNaloqKrq+vp6cfv4+Lht2yQa+h4IiGpZQ5i3AGBP7N05Df25geQYv1YEKAYAJmzvomGleVWEZzuutTEAFG1qyxMvX758+pvMJwzmKRBORYQbA0C5JhUNF5/U7eXlys0WKxTJlZb5lEPlnAYAJm1S0fDpx6+q6tUT32StA79KAGB/TCoaNuLuVZRLL6C4b+PnGSQAPL+DruvGHgMAUABXTwAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBApJhPhPTBi1AW+ywUp/95x0s3KCMaBl/x4BsfYMfZZ6E4yX5qeQLYPIkAZQnLvoyZBgBgq5IlRdEAbMvK9VFgdyRLiqIB2JbFfzrOaYBpcE4DABARDcDm9RdHgck46Lpu7DFEXPMNZbHPQlmSfbaYaAAAxmV5AgCIiAYAICIaAICIaAAAIqIBAIiIBgAgUlg0zGazsYcApNq2bdt27FEAqZUH2cKiAQAYi2gAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIHI49gLX9+ttfYw8BiPz+x99VVf3zwj7Ls3r/vXfHHsJklRcNX3z7w9hDAGB3vX1zMfYQJsvyBAAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQOQx0VDX9cbHAQDsuMPFrbqum6bpP3f3EQAowt3fbx3Rnu5w9SYAUCCVsHGrlyfmsVb/575n725T91S3o29w++EfAQDsgmimob9OMTje9x8fbNNPvJUpcN9bAcDj9A89DisbEZ0IufTvenBoX/nv0TTNYkZhcDt5OQDkmttMY2/EIy+5NBkAAPvmkdGg2gBg3/wfDYMOWDmX8IhumL9ksR5hugKALfGb7TbcOhGy3wHJ4fyBA/8gKcQBAM/JYWgbDrquG3sMa5jNZl9///PYowBgd719czH2EEo1m83Oz88f2MB3TwAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQORx7AGv78rPXYw8BiFxdXVVVdXJyMvZAgM0oLxo++vCDsYcARNr2RVVVp6enYw8E2AzLEwBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABEDrquG3sMAEABzDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQORf+Zdxfjze1KoAAAAASUVORK5CYII="
+                                    src="data:image/png;base64,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"
                                 height="200"
                 width="700"/>
     
@@ -6940,7 +6550,7 @@
             <table style="border-collapse:collapse; margin-left: 5px;">
             <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
                             <th style="padding: 6px 0;">
-                    &nbsp;Device model&nbsp;&nbsp;
+                    &nbsp;Browser&nbsp;&nbsp;
                 </th>
                             <th style="padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
@@ -6965,7 +6575,9 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                        Unknown                                                                                                                        </td>
+                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
+                                        &nbsp;
+                                                                                                            Firefox                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
@@ -6991,12 +6603,12 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getOsFamilies" style="color: rgb(126,115,99); font-size: 11pt;">
-    Operating System families
+<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;">
+    Browser Version
 </h2>
 
             <img alt=""
-                                    src="data:image/png;base64,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"
+                                    src="data:image/png;base64,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"
                                 height="200"
                 width="700"/>
     
@@ -7006,7 +6618,7 @@
             <table style="border-collapse:collapse; margin-left: 5px;">
             <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
                             <th style="padding: 6px 0;">
-                    &nbsp;Operating System families&nbsp;&nbsp;
+                    &nbsp;Browser version&nbsp;&nbsp;
                 </th>
                             <th style="padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
@@ -7031,9 +6643,9 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WI7.gif'>
+                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
                                         &nbsp;
-                                                                                                            Windows                                                                                                                        </td>
+                                                                                                            Firefox 3.6                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
@@ -7059,12 +6671,12 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getOsVersions" style="color: rgb(126,115,99); font-size: 11pt;">
-    Operating System versions
+<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;">
+    Device model
 </h2>
 
             <img alt=""
-                                    src="data:image/png;base64,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"
+                                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAF7UlEQVR4nO3dP24jVQDH8QmbNCuhKBVSAtpibkC2hYIDIOUAVPRItPQguj0BHfWegCPgE6BpgIwEEooEUigiMRQWZjJx4p8TO+M3/nwq/xk7b3c1O9+8N2MfdF1XAQCs8s7YAwAAyiAaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAi+xUNdV0vfXDp4w+/CgD2zX5Fw32apsmf1RAA7KfDsQewSd989+Pgka8+f92/2zRNXdf9CBjcBQDuM6lo+OmXP29ubhZ3j46OLi8vz87OVr7wbkksbg86Y/7UYoP5s/2Nn/YnAIDdNaloqKrq+vp6cfv4+Lht2yQa+h4IiGpZQ5i3AGBP7N05Df25geQYv1YEKAYAJmzvomGleVWEZzuutTEAFG1qyxMvX758+pvMJwzmKRBORYQbA0C5JhUNF5/U7eXlys0WKxTJlZb5lEPlnAYAJm1S0fDpx6+q6tUT32StA79KAGB/TCoaNuLuVZRLL6C4b+PnGSQAPL+DruvGHgMAUABXTwAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBApJhPhPTBi1AW+ywUp/95x0s3KCMaBl/x4BsfYMfZZ6E4yX5qeQLYPIkAZQnLvoyZBgBgq5IlRdEAbMvK9VFgdyRLiqIB2JbFfzrOaYBpcE4DABARDcDm9RdHgck46Lpu7DFEXPMNZbHPQlmSfbaYaAAAxmV5AgCIiAYAICIaAICIaAAAIqIBAIiIBgAgUlg0zGazsYcApNq2bdt27FEAqZUH2cKiAQAYi2gAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIHI49gLX9+ttfYw8BiPz+x99VVf3zwj7Ls3r/vXfHHsJklRcNX3z7w9hDAGB3vX1zMfYQJsvyBAAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQOQx0VDX9cbHAQDsuMPFrbqum6bpP3f3EQAowt3fbx3Rnu5w9SYAUCCVsHGrlyfmsVb/575n725T91S3o29w++EfAQDsgmimob9OMTje9x8fbNNPvJUpcN9bAcDj9A89DisbEZ0IufTvenBoX/nv0TTNYkZhcDt5OQDkmttMY2/EIy+5NBkAAPvmkdGg2gBg3/wfDYMOWDmX8IhumL9ksR5hugKALfGb7TbcOhGy3wHJ4fyBA/8gKcQBAM/JYWgbDrquG3sMa5jNZl9///PYowBgd719czH2EEo1m83Oz88f2MB3TwAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQORx7AGv78rPXYw8BiFxdXVVVdXJyMvZAgM0oLxo++vCDsYcARNr2RVVVp6enYw8E2AzLEwBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABEDrquG3sMAEABzDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQORf+Zdxfjze1KoAAAAASUVORK5CYII="
                                 height="200"
                 width="700"/>
     
@@ -7074,7 +6686,7 @@
             <table style="border-collapse:collapse; margin-left: 5px;">
             <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
                             <th style="padding: 6px 0;">
-                    &nbsp;Operating System versions&nbsp;&nbsp;
+                    &nbsp;Device model&nbsp;&nbsp;
                 </th>
                             <th style="padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
@@ -7099,9 +6711,7 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WXP.gif'>
-                                        &nbsp;
-                                                                                                            Windows XP                                                                                                                        </td>
+                                                                                                                                                                        Unknown                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
@@ -7127,12 +6737,12 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getBrowserFamilies" style="color: rgb(126,115,99); font-size: 11pt;">
-    Browser families
+<h2 id="DevicesDetection_getOsFamilies" style="color: rgb(126,115,99); font-size: 11pt;">
+    Operating System families
 </h2>
 
             <img alt=""
-                                    src="data:image/png;base64,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"
+                                    src="data:image/png;base64,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"
                                 height="200"
                 width="700"/>
     
@@ -7142,7 +6752,7 @@
             <table style="border-collapse:collapse; margin-left: 5px;">
             <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
                             <th style="padding: 6px 0;">
-                    &nbsp;Browser families&nbsp;&nbsp;
+                    &nbsp;Operating system family&nbsp;&nbsp;
                 </th>
                             <th style="padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
@@ -7167,9 +6777,9 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
+                                                                                                                                        <img src='plugins/UserSettings/images/os/WI7.gif'>
                                         &nbsp;
-                                                                                                            Firefox                                                                                                                        </td>
+                                                                                                            Windows                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
@@ -7195,12 +6805,12 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;">
-    Browser versions
+<h2 id="DevicesDetection_getOsVersions" style="color: rgb(126,115,99); font-size: 11pt;">
+    Operating System versions
 </h2>
 
             <img alt=""
-                                    src="data:image/png;base64,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"
+                                    src="data:image/png;base64,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"
                                 height="200"
                 width="700"/>
     
@@ -7210,7 +6820,7 @@
             <table style="border-collapse:collapse; margin-left: 5px;">
             <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
                             <th style="padding: 6px 0;">
-                    &nbsp;Browser versions&nbsp;&nbsp;
+                    &nbsp;Operating System versions&nbsp;&nbsp;
                 </th>
                             <th style="padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
@@ -7235,9 +6845,9 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
+                                                                                                                                        <img src='plugins/UserSettings/images/os/WXP.gif'>
                                         &nbsp;
-                                                                                                            Firefox 3.6                                                                                                                        </td>
+                                                                                                            Windows XP                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
index 3b420d327e..2a5bb4aa2b 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
@@ -50,46 +50,21 @@
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getBrowser" style="text-decoration:none; color: rgb(68,68,68);">
-                    Visitor Browser
-                </a>
-            </li>
-                    <li>
-                <a href="#UserSettings_getBrowserVersion" style="text-decoration:none; color: rgb(68,68,68);">
-                    Browser Version
-                </a>
-            </li>
-                    <li>
                 <a href="#UserSettings_getPlugin" style="text-decoration:none; color: rgb(68,68,68);">
                     Browser Plugins
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getWideScreen" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#UserSettings_getScreenType" style="text-decoration:none; color: rgb(68,68,68);">
                     Normal / Widescreen
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getOS" style="text-decoration:none; color: rgb(68,68,68);">
-                    Operating System
-                </a>
-            </li>
-                    <li>
                 <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);">
                     Visitor Configuration
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getOSFamily" style="text-decoration:none; color: rgb(68,68,68);">
-                    Operating system family
-                </a>
-            </li>
-                    <li>
-                <a href="#UserSettings_getMobileVsDesktop" style="text-decoration:none; color: rgb(68,68,68);">
-                    Mobile vs Desktop
-                </a>
-            </li>
-                    <li>
                 <a href="#UserSettings_getLanguage" style="text-decoration:none; color: rgb(68,68,68);">
                     Browser language
                 </a>
@@ -345,28 +320,28 @@
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);">
-                    Device model
+                <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: rgb(68,68,68);">
+                    Visitor Browser
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(68,68,68);">
-                    Operating System families
+                <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);">
+                    Browser Version
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: rgb(68,68,68);">
-                    Operating System versions
+                <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);">
+                    Device model
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getBrowserFamilies" style="text-decoration:none; color: rgb(68,68,68);">
-                    Browser families
+                <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(68,68,68);">
+                    Operating System families
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);">
-                    Browser versions
+                <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: rgb(68,68,68);">
+                    Operating System versions
                 </a>
             </li>
                     <li>
@@ -1989,130 +1964,6 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getBrowser" style="color: rgb(126,115,99); font-size: 11pt;">
-    Visitor Browser
-</h2>
-
-    
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Browser&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
-                                        &nbsp;
-                                                                                                            Firefox                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                16
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3.2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:22:49
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                20%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                80%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
-<h2 id="UserSettings_getBrowserVersion" style="color: rgb(126,115,99); font-size: 11pt;">
-    Browser Version
-</h2>
-
-    
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Browser version&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
-                                        &nbsp;
-                                                                                                            Firefox 3.6                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                16
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3.2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:22:49
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                20%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                80%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
 <h2 id="UserSettings_getPlugin" style="color: rgb(126,115,99); font-size: 11pt;">
     Browser Plugins
 </h2>
@@ -2268,7 +2119,7 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getWideScreen" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="UserSettings_getScreenType" style="color: rgb(126,115,99); font-size: 11pt;">
     Normal / Widescreen
 </h2>
 
@@ -2330,68 +2181,6 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getOS" style="color: rgb(126,115,99); font-size: 11pt;">
-    Operating System
-</h2>
-
-    
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Operating system&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WXP.gif'>
-                                        &nbsp;
-                                                                                                            Windows XP                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                16
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3.2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:22:49
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                20%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                80%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
 <h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;">
     Visitor Configuration
 </h2>
@@ -2452,155 +2241,6 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getOSFamily" style="color: rgb(126,115,99); font-size: 11pt;">
-    Operating system family
-</h2>
-
-    
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Operating system family&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WXP.gif'>
-                                        &nbsp;
-                                                                                                            Windows                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                16
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3.2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:22:49
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                20%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                80%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
-<h2 id="UserSettings_getMobileVsDesktop" style="color: rgb(126,115,99); font-size: 11pt;">
-    Mobile vs Desktop
-</h2>
-
-    
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Mobile vs Desktop&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/screens/normal.gif'>
-                                        &nbsp;
-                                                                                                            Desktop                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                16
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3.2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:22:49
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                20%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                80%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/screens/mobile.gif'>
-                                        &nbsp;
-                                                                                                            Mobile                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:00:00
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
 <h2 id="UserSettings_getLanguage" style="color: rgb(126,115,99); font-size: 11pt;">
     Browser language
 </h2>
@@ -6613,8 +6253,8 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;">
-    Device model
+<h2 id="DevicesDetection_getBrowsers" style="color: rgb(126,115,99); font-size: 11pt;">
+    Visitor Browser
 </h2>
 
     
@@ -6622,7 +6262,7 @@
             <table style="border-collapse:collapse; margin-left: 5px;">
             <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
                             <th style="padding: 6px 0;">
-                    &nbsp;Device model&nbsp;&nbsp;
+                    &nbsp;Browser&nbsp;&nbsp;
                 </th>
                             <th style="padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
@@ -6647,7 +6287,9 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                        Unknown                                                                                                                        </td>
+                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
+                                        &nbsp;
+                                                                                                            Firefox                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
@@ -6673,8 +6315,8 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getOsFamilies" style="color: rgb(126,115,99); font-size: 11pt;">
-    Operating System families
+<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;">
+    Browser Version
 </h2>
 
     
@@ -6682,7 +6324,7 @@
             <table style="border-collapse:collapse; margin-left: 5px;">
             <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
                             <th style="padding: 6px 0;">
-                    &nbsp;Operating System families&nbsp;&nbsp;
+                    &nbsp;Browser version&nbsp;&nbsp;
                 </th>
                             <th style="padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
@@ -6707,9 +6349,9 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WI7.gif'>
+                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
                                         &nbsp;
-                                                                                                            Windows                                                                                                                        </td>
+                                                                                                            Firefox 3.6                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
@@ -6735,8 +6377,8 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getOsVersions" style="color: rgb(126,115,99); font-size: 11pt;">
-    Operating System versions
+<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;">
+    Device model
 </h2>
 
     
@@ -6744,7 +6386,7 @@
             <table style="border-collapse:collapse; margin-left: 5px;">
             <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
                             <th style="padding: 6px 0;">
-                    &nbsp;Operating System versions&nbsp;&nbsp;
+                    &nbsp;Device model&nbsp;&nbsp;
                 </th>
                             <th style="padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
@@ -6769,9 +6411,7 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WXP.gif'>
-                                        &nbsp;
-                                                                                                            Windows XP                                                                                                                        </td>
+                                                                                                                                                                        Unknown                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
@@ -6797,8 +6437,8 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getBrowserFamilies" style="color: rgb(126,115,99); font-size: 11pt;">
-    Browser families
+<h2 id="DevicesDetection_getOsFamilies" style="color: rgb(126,115,99); font-size: 11pt;">
+    Operating System families
 </h2>
 
     
@@ -6806,7 +6446,7 @@
             <table style="border-collapse:collapse; margin-left: 5px;">
             <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
                             <th style="padding: 6px 0;">
-                    &nbsp;Browser families&nbsp;&nbsp;
+                    &nbsp;Operating system family&nbsp;&nbsp;
                 </th>
                             <th style="padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
@@ -6831,9 +6471,9 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
+                                                                                                                                        <img src='plugins/UserSettings/images/os/WI7.gif'>
                                         &nbsp;
-                                                                                                            Firefox                                                                                                                        </td>
+                                                                                                            Windows                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
@@ -6859,8 +6499,8 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;">
-    Browser versions
+<h2 id="DevicesDetection_getOsVersions" style="color: rgb(126,115,99); font-size: 11pt;">
+    Operating System versions
 </h2>
 
     
@@ -6868,7 +6508,7 @@
             <table style="border-collapse:collapse; margin-left: 5px;">
             <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
                             <th style="padding: 6px 0;">
-                    &nbsp;Browser versions&nbsp;&nbsp;
+                    &nbsp;Operating System versions&nbsp;&nbsp;
                 </th>
                             <th style="padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
@@ -6893,9 +6533,9 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
+                                                                                                                                        <img src='plugins/UserSettings/images/os/WXP.gif'>
                                         &nbsp;
-                                                                                                            Firefox 3.6                                                                                                                        </td>
+                                                                                                            Windows XP                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
index 3db8e7ed77..9727a3b9cb 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowsers_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserFamilies_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowsers_day.xml
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserFamilies_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowsers_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserFamilies_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowsers_week.xml
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_day.xml
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_week.xml
diff --git a/tests/PHPUnit/System/expected/test_noVisit__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_noVisit__DevicesDetection.getBrowsers_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/System/expected/test_noVisit__DevicesDetection.getBrowserFamilies_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__DevicesDetection.getBrowsers_day.xml
diff --git a/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getWideScreen_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getScreenType_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getWideScreen_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getScreenType_day.xml
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
index e030350ae3..724acfc29a 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
@@ -49,8 +49,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -74,14 +82,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.0</browserVersion>
 		<screenType>dual</screenType>
 		<resolution>1111x222</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon>
@@ -164,8 +164,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.0</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.0</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -189,14 +197,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.0</browserVersion>
 		<screenType>dual</screenType>
 		<resolution>1111x222</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon>
@@ -339,8 +339,16 @@
 			</row>
 		</customVariables>
 		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>WXP</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
@@ -364,14 +372,6 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemShortName>Win XP</operatingSystemShortName>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
 		<screenType>dual</screenType>
 		<resolution>1111x222</resolution>
 		<screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon>
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
index 3001bf7177..d04fb0eee4 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
@@ -92,8 +92,16 @@
 				</row>
 			</customVariables>
 			<deviceType>Desktop</deviceType>
+			<operatingSystem>Windows XP</operatingSystem>
+			<operatingSystemCode>WXP</operatingSystemCode>
+			<operatingSystemShortName>Win XP</operatingSystemShortName>
+			<operatingSystemIcon>WXP</operatingSystemIcon>
 			<browserFamily>Gecko</browserFamily>
 			<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+			<browserName>Firefox 3.0</browserName>
+			<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+			<browserCode>FF</browserCode>
+			<browserVersion>3.0</browserVersion>
 			<events>0</events>
 			<provider>Unknown</provider>
 			<providerName>Unknown</providerName>
@@ -117,14 +125,6 @@
 			<location>France</location>
 			<latitude />
 			<longitude />
-			<operatingSystem>Windows XP</operatingSystem>
-			<operatingSystemCode>WXP</operatingSystemCode>
-			<operatingSystemShortName>Win XP</operatingSystemShortName>
-			<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-			<browserName>Firefox 3.0</browserName>
-			<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-			<browserCode>FF</browserCode>
-			<browserVersion>3.0</browserVersion>
 			<screenType>dual</screenType>
 			<resolution>1111x222</resolution>
 			<screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon>
@@ -208,8 +208,16 @@
 				</row>
 			</customVariables>
 			<deviceType>Desktop</deviceType>
+			<operatingSystem>Windows XP</operatingSystem>
+			<operatingSystemCode>WXP</operatingSystemCode>
+			<operatingSystemShortName>Win XP</operatingSystemShortName>
+			<operatingSystemIcon>WXP</operatingSystemIcon>
 			<browserFamily>Gecko</browserFamily>
 			<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+			<browserName>Firefox 3.0</browserName>
+			<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+			<browserCode>FF</browserCode>
+			<browserVersion>3.0</browserVersion>
 			<events>0</events>
 			<provider>Unknown</provider>
 			<providerName>Unknown</providerName>
@@ -233,14 +241,6 @@
 			<location>France</location>
 			<latitude />
 			<longitude />
-			<operatingSystem>Windows XP</operatingSystem>
-			<operatingSystemCode>WXP</operatingSystemCode>
-			<operatingSystemShortName>Win XP</operatingSystemShortName>
-			<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-			<browserName>Firefox 3.0</browserName>
-			<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-			<browserCode>FF</browserCode>
-			<browserVersion>3.0</browserVersion>
 			<screenType>dual</screenType>
 			<resolution>1111x222</resolution>
 			<screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon>