refs #3490 fixed some tests as the position of userId changed

17 files changed, 122 insertions, 122 deletions

diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
index 2c3fb6b0cd..61b4626535 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
@@ -4,7 +4,6 @@
 		<idSite>1</idSite>
 		<idVisit>5</idVisit>
 		<visitIp>156.5.3.2</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -27,6 +26,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -106,7 +106,6 @@
 		<idSite>1</idSite>
 		<idVisit>4</idVisit>
 		<visitIp>156.5.3.2</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -129,6 +128,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -208,7 +208,6 @@
 		<idSite>1</idSite>
 		<idVisit>2</idVisit>
 		<visitIp>156.5.3.2</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -299,6 +298,7 @@
 		
 		<searches>0</searches>
 		<actions>6</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -378,7 +378,6 @@
 		<idSite>1</idSite>
 		<idVisit>3</idVisit>
 		<visitIp>156.5.3.2</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -401,6 +400,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -480,7 +480,6 @@
 		<idSite>1</idSite>
 		<idVisit>1</idVisit>
 		<visitIp>156.5.3.2</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -738,6 +737,7 @@
 		
 		<searches>0</searches>
 		<actions>15</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -817,7 +817,6 @@
 		<idSite>1</idSite>
 		<idVisit>10</idVisit>
 		<visitIp>111.1.1.1</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -840,6 +839,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -915,7 +915,6 @@
 		<idSite>1</idSite>
 		<idVisit>9</idVisit>
 		<visitIp>111.1.1.1</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -938,6 +937,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -1013,7 +1013,6 @@
 		<idSite>1</idSite>
 		<idVisit>7</idVisit>
 		<visitIp>111.1.1.1</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -1104,6 +1103,7 @@
 		
 		<searches>0</searches>
 		<actions>6</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -1179,7 +1179,6 @@
 		<idSite>1</idSite>
 		<idVisit>8</idVisit>
 		<visitIp>111.1.1.1</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -1202,6 +1201,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -1277,7 +1277,6 @@
 		<idSite>1</idSite>
 		<idVisit>6</idVisit>
 		<visitIp>111.1.1.1</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -1535,6 +1534,7 @@
 		
 		<searches>0</searches>
 		<actions>15</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
index 2c3fb6b0cd..61b4626535 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
@@ -4,7 +4,6 @@
 		<idSite>1</idSite>
 		<idVisit>5</idVisit>
 		<visitIp>156.5.3.2</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -27,6 +26,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -106,7 +106,6 @@
 		<idSite>1</idSite>
 		<idVisit>4</idVisit>
 		<visitIp>156.5.3.2</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -129,6 +128,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -208,7 +208,6 @@
 		<idSite>1</idSite>
 		<idVisit>2</idVisit>
 		<visitIp>156.5.3.2</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -299,6 +298,7 @@
 		
 		<searches>0</searches>
 		<actions>6</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -378,7 +378,6 @@
 		<idSite>1</idSite>
 		<idVisit>3</idVisit>
 		<visitIp>156.5.3.2</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -401,6 +400,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -480,7 +480,6 @@
 		<idSite>1</idSite>
 		<idVisit>1</idVisit>
 		<visitIp>156.5.3.2</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -738,6 +737,7 @@
 		
 		<searches>0</searches>
 		<actions>15</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -817,7 +817,6 @@
 		<idSite>1</idSite>
 		<idVisit>10</idVisit>
 		<visitIp>111.1.1.1</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -840,6 +839,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -915,7 +915,6 @@
 		<idSite>1</idSite>
 		<idVisit>9</idVisit>
 		<visitIp>111.1.1.1</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -938,6 +937,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -1013,7 +1013,6 @@
 		<idSite>1</idSite>
 		<idVisit>7</idVisit>
 		<visitIp>111.1.1.1</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -1104,6 +1103,7 @@
 		
 		<searches>0</searches>
 		<actions>6</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -1179,7 +1179,6 @@
 		<idSite>1</idSite>
 		<idVisit>8</idVisit>
 		<visitIp>111.1.1.1</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -1202,6 +1201,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -1277,7 +1277,6 @@
 		<idSite>1</idSite>
 		<idVisit>6</idVisit>
 		<visitIp>111.1.1.1</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -1535,6 +1534,7 @@
 		
 		<searches>0</searches>
 		<actions>15</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
index 2ff757424d..06291c5c5f 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
@@ -4,7 +4,6 @@
 		<idSite>1</idSite>
 		<idVisit>40</idVisit>
 		<visitIp>174.97.139.63</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -43,6 +42,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -126,7 +126,6 @@
 		<idSite>1</idSite>
 		<idVisit>33</idVisit>
 		<visitIp>206.190.75.8</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -181,6 +180,7 @@
 		
 		<searches>0</searches>
 		<actions>2</actions>
+		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -251,7 +251,6 @@
 		<idSite>1</idSite>
 		<idVisit>39</idVisit>
 		<visitIp>193.159.20.129</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -290,6 +289,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -385,7 +385,6 @@
 		<idSite>1</idSite>
 		<idVisit>37</idVisit>
 		<visitIp>50.244.17.130</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -440,6 +439,7 @@
 		
 		<searches>0</searches>
 		<actions>2</actions>
+		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -527,7 +527,6 @@
 		<idSite>1</idSite>
 		<idVisit>38</idVisit>
 		<visitIp>84.194.72.21</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -555,6 +554,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>0</visitConverted>
@@ -642,7 +642,6 @@
 		<idSite>1</idSite>
 		<idVisit>36</idVisit>
 		<visitIp>108.211.181.12</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -681,6 +680,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -776,7 +776,6 @@
 		<idSite>1</idSite>
 		<idVisit>35</idVisit>
 		<visitIp>219.101.46.222</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -814,6 +813,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -897,7 +897,6 @@
 		<idSite>1</idSite>
 		<idVisit>34</idVisit>
 		<visitIp>80.136.160.65</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -936,6 +935,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -1011,7 +1011,6 @@
 		<idSite>1</idSite>
 		<idVisit>32</idVisit>
 		<visitIp>188.107.238.9</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -1050,6 +1049,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -1145,7 +1145,6 @@
 		<idSite>1</idSite>
 		<idVisit>30</idVisit>
 		<visitIp>93.80.130.163</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -1219,6 +1218,7 @@
 		
 		<searches>0</searches>
 		<actions>3</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -1298,7 +1298,6 @@
 		<idSite>1</idSite>
 		<idVisit>31</idVisit>
 		<visitIp>176.41.226.154</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -1337,6 +1336,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -1424,7 +1424,6 @@
 		<idSite>1</idSite>
 		<idVisit>29</idVisit>
 		<visitIp>84.194.72.21</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -1463,6 +1462,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -1550,7 +1550,6 @@
 		<idSite>1</idSite>
 		<idVisit>41</idVisit>
 		<visitIp>175.41.192.40</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -1751,6 +1750,7 @@
 		
 		<searches>0</searches>
 		<actions>10</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -1817,7 +1817,6 @@
 		<idSite>1</idSite>
 		<idVisit>26</idVisit>
 		<visitIp>0.0.0.0</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -1863,6 +1862,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -1942,7 +1942,6 @@
 		<idSite>1</idSite>
 		<idVisit>27</idVisit>
 		<visitIp>0.0.0.0</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -1980,6 +1979,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -2075,7 +2075,6 @@
 		<idSite>1</idSite>
 		<idVisit>25</idVisit>
 		<visitIp>175.41.192.41</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -2113,6 +2112,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -2183,7 +2183,6 @@
 		<idSite>1</idSite>
 		<idVisit>24</idVisit>
 		<visitIp>175.41.192.43</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -2238,6 +2237,7 @@
 		
 		<searches>0</searches>
 		<actions>2</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -2308,7 +2308,6 @@
 		<idSite>1</idSite>
 		<idVisit>23</idVisit>
 		<visitIp>175.41.192.42</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -2370,6 +2369,7 @@
 		
 		<searches>0</searches>
 		<actions>3</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -2440,7 +2440,6 @@
 		<idSite>1</idSite>
 		<idVisit>22</idVisit>
 		<visitIp>72.44.32.11</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -2478,6 +2477,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -2548,7 +2548,6 @@
 		<idSite>1</idSite>
 		<idVisit>21</idVisit>
 		<visitIp>72.44.32.11</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -2586,6 +2585,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -2656,7 +2656,6 @@
 		<idSite>1</idSite>
 		<idVisit>18</idVisit>
 		<visitIp>1.2.3.4</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -2684,6 +2683,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -2754,7 +2754,6 @@
 		<idSite>1</idSite>
 		<idVisit>20</idVisit>
 		<visitIp>175.41.192.41</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -2792,6 +2791,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -2862,7 +2862,6 @@
 		<idSite>1</idSite>
 		<idVisit>19</idVisit>
 		<visitIp>175.41.192.41</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -2900,6 +2899,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -2970,7 +2970,6 @@
 		<idSite>1</idSite>
 		<idVisit>17</idVisit>
 		<visitIp>0.0.0.0</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -3008,6 +3007,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -3074,7 +3074,6 @@
 		<idSite>1</idSite>
 		<idVisit>16</idVisit>
 		<visitIp>0.0.0.0</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -3112,6 +3111,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -3178,7 +3178,6 @@
 		<idSite>1</idSite>
 		<idVisit>15</idVisit>
 		<visitIp>177.71.128.21</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -3216,6 +3215,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -3282,7 +3282,6 @@
 		<idSite>1</idSite>
 		<idVisit>14</idVisit>
 		<visitIp>177.71.128.21</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -3320,6 +3319,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -3386,7 +3386,6 @@
 		<idSite>1</idSite>
 		<idVisit>13</idVisit>
 		<visitIp>177.71.128.21</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -3424,6 +3423,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -3490,7 +3490,6 @@
 		<idSite>1</idSite>
 		<idVisit>12</idVisit>
 		<visitIp>175.41.192.34</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -3528,6 +3527,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -3594,7 +3594,6 @@
 		<idSite>1</idSite>
 		<idVisit>11</idVisit>
 		<visitIp>175.41.192.34</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -3632,6 +3631,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -3698,7 +3698,6 @@
 		<idSite>1</idSite>
 		<idVisit>10</idVisit>
 		<visitIp>0.0.0.0</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -3736,6 +3735,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -3802,7 +3802,6 @@
 		<idSite>1</idSite>
 		<idVisit>9</idVisit>
 		<visitIp>0.0.0.0</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -3840,6 +3839,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -3906,7 +3906,6 @@
 		<idSite>1</idSite>
 		<idVisit>8</idVisit>
 		<visitIp>0.0.0.0</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -3944,6 +3943,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -4010,7 +4010,6 @@
 		<idSite>1</idSite>
 		<idVisit>7</idVisit>
 		<visitIp>72.44.32.10</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -4048,6 +4047,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -4114,7 +4114,6 @@
 		<idSite>1</idSite>
 		<idVisit>6</idVisit>
 		<visitIp>72.44.32.10</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -4152,6 +4151,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -4218,7 +4218,6 @@
 		<idSite>1</idSite>
 		<idVisit>5</idVisit>
 		<visitIp>72.44.32.10</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -4256,6 +4255,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -4322,7 +4322,6 @@
 		<idSite>1</idSite>
 		<idVisit>4</idVisit>
 		<visitIp>175.41.192.40</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -4360,6 +4359,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -4426,7 +4426,6 @@
 		<idSite>1</idSite>
 		<idVisit>3</idVisit>
 		<visitIp>175.41.192.40</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -4464,6 +4463,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -4530,7 +4530,6 @@
 		<idSite>1</idSite>
 		<idVisit>2</idVisit>
 		<visitIp>175.41.192.40</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -4568,6 +4567,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -4634,7 +4634,6 @@
 		<idSite>1</idSite>
 		<idVisit>1</idVisit>
 		<visitIp>175.41.192.40</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -4672,6 +4671,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
index 7f7be6d377..53636dbe00 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
@@ -4,7 +4,6 @@
 		<idSite>1</idSite>
 		<idVisit>1</idVisit>
 		<visitIp>1.2.4.0</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -44,6 +43,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -129,7 +129,6 @@
 		<idSite>1</idSite>
 		<idVisit>2</idVisit>
 		<visitIp>1.2.4.0</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -200,6 +199,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -285,7 +285,6 @@
 		<idSite>1</idSite>
 		<idVisit>19</idVisit>
 		<visitIp>194.57.91.215</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -325,6 +324,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -410,7 +410,6 @@
 		<idSite>1</idSite>
 		<idVisit>20</idVisit>
 		<visitIp>194.57.91.215</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -481,6 +480,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -566,7 +566,6 @@
 		<idSite>1</idSite>
 		<idVisit>23</idVisit>
 		<visitIp>137.82.130.0</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -606,6 +605,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -691,7 +691,6 @@
 		<idSite>1</idSite>
 		<idVisit>24</idVisit>
 		<visitIp>137.82.130.0</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -762,6 +761,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -839,7 +839,6 @@
 		<idSite>1</idSite>
 		<idVisit>31</idVisit>
 		<visitIp>151.100.101.92</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -879,6 +878,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
index d24401b6dc..47c2f38c4e 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
@@ -4,7 +4,6 @@
 		<idSite>1</idSite>
 		<idVisit>35</idVisit>
 		<visitIp>194.57.91.215</visitIp>
-		<userId>userid.email@example.org</userId>
 		
 		<actionDetails>
 			<row>
@@ -34,6 +33,7 @@
 		
 		
 		
+		<userId>userid.email@example.org</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -111,7 +111,6 @@
 		<idSite>1</idSite>
 		<idVisit>18</idVisit>
 		<visitIp>1.2.4.8</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -182,6 +181,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -267,7 +267,6 @@
 		<idSite>1</idSite>
 		<idVisit>17</idVisit>
 		<visitIp>1.2.4.8</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -307,6 +306,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -392,7 +392,6 @@
 		<idSite>1</idSite>
 		<idVisit>16</idVisit>
 		<visitIp>1.2.4.7</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -446,6 +445,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -531,7 +531,6 @@
 		<idSite>1</idSite>
 		<idVisit>15</idVisit>
 		<visitIp>1.2.4.7</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -571,6 +570,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -656,7 +656,6 @@
 		<idSite>1</idSite>
 		<idVisit>14</idVisit>
 		<visitIp>1.2.4.6</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -727,6 +726,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -812,7 +812,6 @@
 		<idSite>1</idSite>
 		<idVisit>13</idVisit>
 		<visitIp>1.2.4.6</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -852,6 +851,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
index 47d78e80e8..8c0eba69bb 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
@@ -4,7 +4,6 @@
 		<idSite>1</idSite>
 		<idVisit>18</idVisit>
 		<visitIp>1.2.4.8</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -75,6 +74,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -160,7 +160,6 @@
 		<idSite>1</idSite>
 		<idVisit>17</idVisit>
 		<visitIp>1.2.4.8</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -200,6 +199,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -285,7 +285,6 @@
 		<idSite>1</idSite>
 		<idVisit>14</idVisit>
 		<visitIp>1.2.4.6</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -356,6 +355,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -441,7 +441,6 @@
 		<idSite>1</idSite>
 		<idVisit>16</idVisit>
 		<visitIp>1.2.4.7</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -495,6 +494,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -580,7 +580,6 @@
 		<idSite>1</idSite>
 		<idVisit>15</idVisit>
 		<visitIp>1.2.4.7</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -620,6 +619,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -705,7 +705,6 @@
 		<idSite>1</idSite>
 		<idVisit>13</idVisit>
 		<visitIp>1.2.4.6</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -745,6 +744,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -830,7 +830,6 @@
 		<idSite>1</idSite>
 		<idVisit>35</idVisit>
 		<visitIp>194.57.91.215</visitIp>
-		<userId>userid.email@example.org</userId>
 		
 		<actionDetails>
 			<row>
@@ -860,6 +859,7 @@
 		
 		
 		
+		<userId>userid.email@example.org</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
index d24401b6dc..47c2f38c4e 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
@@ -4,7 +4,6 @@
 		<idSite>1</idSite>
 		<idVisit>35</idVisit>
 		<visitIp>194.57.91.215</visitIp>
-		<userId>userid.email@example.org</userId>
 		
 		<actionDetails>
 			<row>
@@ -34,6 +33,7 @@
 		
 		
 		
+		<userId>userid.email@example.org</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -111,7 +111,6 @@
 		<idSite>1</idSite>
 		<idVisit>18</idVisit>
 		<visitIp>1.2.4.8</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -182,6 +181,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -267,7 +267,6 @@
 		<idSite>1</idSite>
 		<idVisit>17</idVisit>
 		<visitIp>1.2.4.8</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -307,6 +306,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -392,7 +392,6 @@
 		<idSite>1</idSite>
 		<idVisit>16</idVisit>
 		<visitIp>1.2.4.7</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -446,6 +445,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -531,7 +531,6 @@
 		<idSite>1</idSite>
 		<idVisit>15</idVisit>
 		<visitIp>1.2.4.7</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -571,6 +570,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -656,7 +656,6 @@
 		<idSite>1</idSite>
 		<idVisit>14</idVisit>
 		<visitIp>1.2.4.6</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -727,6 +726,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -812,7 +812,6 @@
 		<idSite>1</idSite>
 		<idVisit>13</idVisit>
 		<visitIp>1.2.4.6</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -852,6 +851,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
index 0d104ef874..ce1748a73a 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
@@ -4,7 +4,6 @@
 		<idSite>1</idSite>
 		<idVisit>35</idVisit>
 		<visitIp>194.57.91.215</visitIp>
-		<userId>userid.email@example.org</userId>
 		
 		<actionDetails>
 			<row>
@@ -34,6 +33,7 @@
 		
 		
 		
+		<userId>userid.email@example.org</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -111,7 +111,6 @@
 		<idSite>1</idSite>
 		<idVisit>18</idVisit>
 		<visitIp>1.2.4.8</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -182,6 +181,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -267,7 +267,6 @@
 		<idSite>1</idSite>
 		<idVisit>17</idVisit>
 		<visitIp>1.2.4.8</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -307,6 +306,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -392,7 +392,6 @@
 		<idSite>1</idSite>
 		<idVisit>16</idVisit>
 		<visitIp>1.2.4.7</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -446,6 +445,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -531,7 +531,6 @@
 		<idSite>1</idSite>
 		<idVisit>15</idVisit>
 		<visitIp>1.2.4.7</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -571,6 +570,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -656,7 +656,6 @@
 		<idSite>1</idSite>
 		<idVisit>14</idVisit>
 		<visitIp>1.2.4.6</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -727,6 +726,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -812,7 +812,6 @@
 		<idSite>1</idSite>
 		<idVisit>13</idVisit>
 		<visitIp>1.2.4.6</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -852,6 +851,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -937,7 +937,6 @@
 		<idSite>1</idSite>
 		<idVisit>12</idVisit>
 		<visitIp>1.2.4.5</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -991,6 +990,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -1076,7 +1076,6 @@
 		<idSite>1</idSite>
 		<idVisit>11</idVisit>
 		<visitIp>1.2.4.5</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -1116,6 +1115,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -1201,7 +1201,6 @@
 		<idSite>1</idSite>
 		<idVisit>10</idVisit>
 		<visitIp>1.2.4.4</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -1272,6 +1271,7 @@
 		
 		
 		
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
index 97cb7d23db..2ceb5d70bf 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
@@ -4,7 +4,6 @@
 		<idSite>1</idSite>
 		<idVisit>2</idVisit>
 		<visitIp>156.5.3.2</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -37,6 +36,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -112,7 +112,6 @@
 		<idSite>1</idSite>
 		<idVisit>1</idVisit>
 		<visitIp>156.5.3.2</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -225,6 +224,7 @@
 		
 		<searches>1</searches>
 		<actions>8</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
index 0135b49bd2..f77489d7a3 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
@@ -4,7 +4,6 @@
 		<idSite>1</idSite>
 		<idVisit>1</idVisit>
 		<visitIp>74.125.31.147</visitIp>
-		<userId />
 		<actionDetails>
 			<row>
 				<type>action</type>
@@ -31,6 +30,7 @@
 		<lastActionDateTime>2013-04-07 10:00:00</lastActionDateTime>
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -97,7 +97,6 @@
 		<idSite>1</idSite>
 		<idVisit>2</idVisit>
 		<visitIp>74.125.31.147</visitIp>
-		<userId />
 		<actionDetails>
 			<row>
 				<type>action</type>
@@ -124,6 +123,7 @@
 		<lastActionDateTime>2013-04-06 11:00:00</lastActionDateTime>
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -190,7 +190,6 @@
 		<idSite>1</idSite>
 		<idVisit>3</idVisit>
 		<visitIp>74.125.31.147</visitIp>
-		<userId />
 		<actionDetails>
 			<row>
 				<type>action</type>
@@ -217,6 +216,7 @@
 		<lastActionDateTime>2013-04-05 12:00:00</lastActionDateTime>
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
index 3ee6705d11..4d5a3bb878 100644
--- a/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
@@ -4,7 +4,6 @@
 		<idSite>1</idSite>
 		<idVisit>1</idVisit>
 		<visitIp>156.5.3.2</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -26,6 +25,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml
index ae0cf2abf9..42a3d68d01 100644
--- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml
@@ -2,7 +2,6 @@
 <result>
 	<row>
 		<idVisit>1</idVisit>
-		<userId />
 		<visitorId>a13b7c5a62f72dea</visitorId>
 		<actionDetails>
 			<row>
@@ -17,10 +16,10 @@
 		</actionDetails>
 		<lastActionDateTime>2010-03-06 11:22:33</lastActionDateTime>
 		<actions>1</actions>
+		<userId />
 	</row>
 	<row>
 		<idVisit>2</idVisit>
-		<userId />
 		<visitorId>f66bc315f2a01a79</visitorId>
 		<actionDetails>
 			<row>
@@ -46,10 +45,10 @@
 		</actionDetails>
 		<lastActionDateTime>2010-03-06 11:28:33</lastActionDateTime>
 		<actions>2</actions>
+		<userId />
 	</row>
 	<row>
 		<idVisit>3</idVisit>
-		<userId>email@example.com</userId>
 		<visitorId>9395988394d4568d</visitorId>
 		<actionDetails>
 			<row>
@@ -75,10 +74,10 @@
 		</actionDetails>
 		<lastActionDateTime>2010-03-06 13:28:33</lastActionDateTime>
 		<actions>2</actions>
+		<userId>email@example.com</userId>
 	</row>
 	<row>
 		<idVisit>4</idVisit>
-		<userId>new-email@example.com</userId>
 		<visitorId>c9ade7a5a103b2ed</visitorId>
 		<actionDetails>
 			<row>
@@ -93,10 +92,10 @@
 		</actionDetails>
 		<lastActionDateTime>2010-03-06 13:34:33</lastActionDateTime>
 		<actions>1</actions>
+		<userId>new-email@example.com</userId>
 	</row>
 	<row>
 		<idVisit>5</idVisit>
-		<userId>new-email@example.com</userId>
 		<visitorId>c9ade7a5a103b2ed</visitorId>
 		<actionDetails>
 			<row>
@@ -148,10 +147,10 @@
 		</actionDetails>
 		<lastActionDateTime>2010-03-06 16:40:33</lastActionDateTime>
 		<actions>2</actions>
+		<userId>new-email@example.com</userId>
 	</row>
 	<row>
 		<idVisit>6</idVisit>
-		<userId />
 		<visitorId>5e15b4d842cc294d</visitorId>
 		<actionDetails>
 			<row>
@@ -166,10 +165,10 @@
 		</actionDetails>
 		<lastActionDateTime>2010-03-06 16:28:33</lastActionDateTime>
 		<actions>1</actions>
+		<userId />
 	</row>
 	<row>
 		<idVisit>7</idVisit>
-		<userId>email@example.com</userId>
 		<visitorId>9395988394d4568d</visitorId>
 		<actionDetails>
 			<row>
@@ -184,10 +183,10 @@
 		</actionDetails>
 		<lastActionDateTime>2010-03-14 11:22:33</lastActionDateTime>
 		<actions>1</actions>
+		<userId>email@example.com</userId>
 	</row>
 	<row>
 		<idVisit>8</idVisit>
-		<userId>new-user-id@one-weeklater</userId>
 		<visitorId>72d4b5565daf5546</visitorId>
 		<actionDetails>
 			<row>
@@ -202,5 +201,6 @@
 		</actionDetails>
 		<lastActionDateTime>2010-03-14 11:46:33</lastActionDateTime>
 		<actions>1</actions>
+		<userId>new-user-id@one-weeklater</userId>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv
index eab8c16736..c287c4bf01 100644
--- a/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv
+++ b/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
index d79b87b412..25ac19a415 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
@@ -4,7 +4,6 @@
 		<idSite>1</idSite>
 		<idVisit>5</idVisit>
 		<visitIp>156.5.3.2</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -52,6 +51,7 @@
 		
 		<searches>0</searches>
 		<actions>0</actions>
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -139,7 +139,6 @@
 		<idSite>1</idSite>
 		<idVisit>4</idVisit>
 		<visitIp>156.5.3.2</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -263,6 +262,7 @@
 		
 		<searches>0</searches>
 		<actions>3</actions>
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
index 1604ba4335..30ae50eb8f 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
@@ -4,7 +4,6 @@
 		<idSite>1</idSite>
 		<idVisit>3</idVisit>
 		<visitIp>156.5.3.2</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -128,6 +127,7 @@
 		
 		<searches>0</searches>
 		<actions>3</actions>
+		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>0</visitConverted>
@@ -215,7 +215,6 @@
 		<idSite>1</idSite>
 		<idVisit>2</idVisit>
 		<visitIp>156.5.3.2</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -458,6 +457,7 @@
 		
 		<searches>0</searches>
 		<actions>6</actions>
+		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -545,7 +545,6 @@
 		<idSite>1</idSite>
 		<idVisit>1</idVisit>
 		<visitIp>156.5.3.2</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -678,6 +677,7 @@
 		
 		<searches>0</searches>
 		<actions>4</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
index 991e9a10d5..8112427124 100644
--- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
@@ -4,7 +4,6 @@
 		<idSite>1</idSite>
 		<idVisit>3</idVisit>
 		<visitIp>156.5.3.2</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -26,6 +25,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -109,7 +109,6 @@
 		<idSite>1</idSite>
 		<idVisit>2</idVisit>
 		<visitIp>156.5.3.2</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -141,6 +140,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -224,7 +224,6 @@
 		<idSite>1</idSite>
 		<idVisit>1</idVisit>
 		<visitIp>156.5.3.2</visitIp>
-		<userId />
 		
 		<actionDetails>
 			<row>
@@ -312,6 +311,7 @@
 		
 		<searches>0</searches>
 		<actions>3</actions>
+		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
index 7cfdbb21e2..853144f18a 100644
--- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
+++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
@@ -47,7 +47,6 @@
 			<idSite>1</idSite>
 			<idVisit>3</idVisit>
 			<visitIp>156.5.3.2</visitIp>
-			<userId />
 			
 			<actionDetails>
 				<row>
@@ -69,6 +68,7 @@
 			
 			<searches>0</searches>
 			<actions>1</actions>
+			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
@@ -153,7 +153,6 @@
 			<idSite>1</idSite>
 			<idVisit>2</idVisit>
 			<visitIp>156.5.3.2</visitIp>
-			<userId />
 			
 			<actionDetails>
 				<row>
@@ -185,6 +184,7 @@
 			
 			<searches>0</searches>
 			<actions>1</actions>
+			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>1</visitConverted>