added screen to see custom variable usages

23 files changed, 1038 insertions, 0 deletions

diff --git a/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml
index c8cd332705..cb25516ca4 100644
--- a/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml
@@ -4,6 +4,12 @@
 		<row>
 			<label>CustomVarPage</label>
 			<nb_actions>18</nb_actions>
+			<slots>
+				<row>
+					<scope>page</scope>
+					<index>1</index>
+				</row>
+			</slots>
 			<is_aggregate>1</is_aggregate>
 		</row>
 		<row>
@@ -15,6 +21,12 @@
 			<sum_visit_length>6</sum_visit_length>
 			<bounce_count>0</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
+			<slots>
+				<row>
+					<scope>visit</scope>
+					<index>1</index>
+				</row>
+			</slots>
 			<is_aggregate>1</is_aggregate>
 		</row>
 		<row>
@@ -68,6 +80,12 @@
 			<sum_visit_length>1</sum_visit_length>
 			<bounce_count>0</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
+			<slots>
+				<row>
+					<scope>visit</scope>
+					<index>1</index>
+				</row>
+			</slots>
 			<is_aggregate>1</is_aggregate>
 		</row>
 		<row>
@@ -84,6 +102,12 @@
 		<row>
 			<label>CustomVarPage</label>
 			<nb_actions>1</nb_actions>
+			<slots>
+				<row>
+					<scope>page</scope>
+					<index>1</index>
+				</row>
+			</slots>
 			<is_aggregate>1</is_aggregate>
 		</row>
 		<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
index dc1a11ab2b..a1fea85a41 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
@@ -3,6 +3,12 @@
 	<row>
 		<label>HTTP-code</label>
 		<nb_actions>43</nb_actions>
+		<slots>
+			<row>
+				<scope>page</scope>
+				<index>1</index>
+			</row>
+		</slots>
 		<segment>customVariableName==HTTP-code</segment>
 		<subtable>
 			<row>
@@ -61,6 +67,12 @@
 		<revenue>25</revenue>
 		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<slots>
+			<row>
+				<scope>visit</scope>
+				<index>1</index>
+			</row>
+		</slots>
 		<segment>customVariableName==Not-Bot</segment>
 		<subtable>
 			<row>
@@ -151,6 +163,12 @@
 		<revenue>10</revenue>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<slots>
+			<row>
+				<scope>visit</scope>
+				<index>1</index>
+			</row>
+		</slots>
 		<segment>customVariableName==User+Name</segment>
 		<subtable>
 			<row>
@@ -196,6 +214,12 @@
 	<row>
 		<label>Generation Time</label>
 		<nb_actions>4</nb_actions>
+		<slots>
+			<row>
+				<scope>page</scope>
+				<index>1</index>
+			</row>
+		</slots>
 		<segment>customVariableName==Generation+Time</segment>
 		<subtable>
 			<row>
@@ -221,6 +245,12 @@
 	<row>
 		<label>Windows Status Code</label>
 		<nb_actions>4</nb_actions>
+		<slots>
+			<row>
+				<scope>page</scope>
+				<index>2</index>
+			</row>
+		</slots>
 		<segment>customVariableName==Windows+Status+Code</segment>
 		<subtable>
 			<row>
@@ -267,6 +297,12 @@
 		<revenue>5</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<slots>
+			<row>
+				<scope>visit</scope>
+				<index>1</index>
+			</row>
+		</slots>
 		<segment>customVariableName==Bot</segment>
 		<subtable>
 			<row>
@@ -308,6 +344,12 @@
 		<revenue>5</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<slots>
+			<row>
+				<scope>visit</scope>
+				<index>3</index>
+			</row>
+		</slots>
 		<segment>customVariableName==Forum+status</segment>
 		<subtable>
 			<row>
@@ -349,6 +391,12 @@
 		<revenue>5</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<slots>
+			<row>
+				<scope>visit</scope>
+				<index>5</index>
+			</row>
+		</slots>
 		<segment>customVariableName==VisitorType</segment>
 		<subtable>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml
new file mode 100644
index 0000000000..002b96ca46
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<scope>visit</scope>
+		<index>1</index>
+		<usages>
+			<row>
+				<name>Domain landed</name>
+				<nb_visits>12</nb_visits>
+				<nb_actions>16</nb_actions>
+			</row>
+			<row>
+				<name>Not-Bot</name>
+				<nb_visits>7</nb_visits>
+				<nb_actions>10</nb_actions>
+			</row>
+			<row>
+				<name>User Name</name>
+				<nb_visits>3</nb_visits>
+				<nb_actions>5</nb_actions>
+			</row>
+			<row>
+				<name>Bot</name>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+		</usages>
+	</row>
+	<row>
+		<scope>visit</scope>
+		<index>2</index>
+		<usages>
+			<row>
+				<name>Demo language</name>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+		</usages>
+	</row>
+	<row>
+		<scope>visit</scope>
+		<index>3</index>
+		<usages>
+			<row>
+				<name>Forum status</name>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+		</usages>
+	</row>
+	<row>
+		<scope>visit</scope>
+		<index>4</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>visit</scope>
+		<index>5</index>
+		<usages>
+			<row>
+				<name>VisitorType</name>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>1</index>
+		<usages>
+			<row>
+				<name>HTTP-code</name>
+				<nb_visits>0</nb_visits>
+				<nb_actions>69</nb_actions>
+			</row>
+			<row>
+				<name>Generation Time</name>
+				<nb_visits>0</nb_visits>
+				<nb_actions>4</nb_actions>
+			</row>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>2</index>
+		<usages>
+			<row>
+				<name>Windows Status Code</name>
+				<nb_visits>0</nb_visits>
+				<nb_actions>4</nb_actions>
+			</row>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>3</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>4</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>5</index>
+		<usages>
+		</usages>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CustomVariables.getUsagesOfSlots.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CustomVariables.getUsagesOfSlots.xml
new file mode 100644
index 0000000000..81163427e5
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CustomVariables.getUsagesOfSlots.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<scope>visit</scope>
+		<index>1</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>visit</scope>
+		<index>2</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>visit</scope>
+		<index>3</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>visit</scope>
+		<index>4</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>visit</scope>
+		<index>5</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>1</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>2</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>3</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>4</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>5</index>
+		<usages>
+		</usages>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__CustomVariables.getUsagesOfSlots.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__CustomVariables.getUsagesOfSlots.xml
new file mode 100644
index 0000000000..81163427e5
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__CustomVariables.getUsagesOfSlots.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<scope>visit</scope>
+		<index>1</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>visit</scope>
+		<index>2</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>visit</scope>
+		<index>3</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>visit</scope>
+		<index>4</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>visit</scope>
+		<index>5</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>1</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>2</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>3</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>4</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>5</index>
+		<usages>
+		</usages>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_day.xml
index 9a056e8786..5b6b0bc255 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_day.xml
@@ -6,6 +6,12 @@
 				<label>_pk_scount</label>
 				<nb_visits>4</nb_visits>
 				<nb_actions>6</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>5</index>
+					</row>
+				</slots>
 				<segment>customVariableName==_pk_scount</segment>
 				<subtable>
 					<row>
@@ -24,6 +30,12 @@
 				<label>_pk_scat</label>
 				<nb_visits>2</nb_visits>
 				<nb_actions>3</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>4</index>
+					</row>
+				</slots>
 				<segment>customVariableName==_pk_scat</segment>
 				<subtable>
 					<row>
@@ -39,6 +51,12 @@
 				<label>_pk_scount</label>
 				<nb_visits>3</nb_visits>
 				<nb_actions>3</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>5</index>
+					</row>
+				</slots>
 				<segment>customVariableName==_pk_scount</segment>
 				<subtable>
 					<row>
@@ -62,6 +80,12 @@
 				<label>_pk_scat</label>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>4</index>
+					</row>
+				</slots>
 				<segment>customVariableName==_pk_scat</segment>
 				<subtable>
 					<row>
@@ -89,6 +113,12 @@
 				<label>_pk_scount</label>
 				<nb_visits>1</nb_visits>
 				<nb_actions>2</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>5</index>
+					</row>
+				</slots>
 				<segment>customVariableName==_pk_scount</segment>
 				<subtable>
 					<row>
@@ -102,6 +132,12 @@
 				<label>_pk_scat</label>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>4</index>
+					</row>
+				</slots>
 				<segment>customVariableName==_pk_scat</segment>
 				<subtable>
 					<row>
@@ -130,6 +166,12 @@
 				<sum_visit_length>541</sum_visit_length>
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>0</nb_visits_converted>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>1</index>
+					</row>
+				</slots>
 				<segment>customVariableName==test+cvar+name</segment>
 				<subtable>
 					<row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml
index 50b6b4821e..76eae7c657 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml
@@ -7,6 +7,12 @@
 				<nb_visits>7</nb_visits>
 				<nb_actions>9</nb_actions>
 				<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>5</index>
+					</row>
+				</slots>
 				<segment>customVariableName==_pk_scount</segment>
 				<subtable>
 					<row>
@@ -34,6 +40,12 @@
 				<nb_visits>4</nb_visits>
 				<nb_actions>5</nb_actions>
 				<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>4</index>
+					</row>
+				</slots>
 				<segment>customVariableName==_pk_scat</segment>
 				<subtable>
 					<row>
@@ -71,6 +83,12 @@
 				<nb_visits>1</nb_visits>
 				<nb_actions>2</nb_actions>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>5</index>
+					</row>
+				</slots>
 				<segment>customVariableName==_pk_scount</segment>
 				<subtable>
 					<row>
@@ -86,6 +104,12 @@
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>4</index>
+					</row>
+				</slots>
 				<segment>customVariableName==_pk_scat</segment>
 				<subtable>
 					<row>
@@ -116,6 +140,12 @@
 				<nb_visits_converted>0</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_nb_users>0</sum_daily_nb_users>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>1</index>
+					</row>
+				</slots>
 				<segment>customVariableName==test+cvar+name</segment>
 				<subtable>
 					<row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml
index 96a5e2ca93..04b14932b5 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml
@@ -111,11 +111,23 @@
 	<reportMetadata>
 		<result prettyDate="Sunday, January 3, 2010">
 			<row>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>5</index>
+					</row>
+				</slots>
 				
 				<segment>customVariableName==_pk_scount</segment>
 				<idsubdatatable>3173</idsubdatatable>
 			</row>
 			<row>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>4</index>
+					</row>
+				</slots>
 				
 				<segment>customVariableName==_pk_scat</segment>
 				<idsubdatatable>3172</idsubdatatable>
@@ -123,11 +135,23 @@
 		</result>
 		<result prettyDate="Monday, January 4, 2010">
 			<row>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>5</index>
+					</row>
+				</slots>
 				
 				<segment>customVariableName==_pk_scount</segment>
 				<idsubdatatable>3176</idsubdatatable>
 			</row>
 			<row>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>4</index>
+					</row>
+				</slots>
 				
 				<segment>customVariableName==_pk_scat</segment>
 				<idsubdatatable>3175</idsubdatatable>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml
index 84acfed862..0d9935f4ed 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml
@@ -80,11 +80,23 @@
 	<reportMetadata>
 		<result prettyDate="January 2010">
 			<row>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>5</index>
+					</row>
+				</slots>
 				
 				<segment>customVariableName==_pk_scount</segment>
 				<idsubdatatable>3198</idsubdatatable>
 			</row>
 			<row>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>4</index>
+					</row>
+				</slots>
 				
 				<segment>customVariableName==_pk_scat</segment>
 				<idsubdatatable>3197</idsubdatatable>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__CustomVariables.getCustomVariables_day.xml
index 1d0ee64c8d..caf12153e5 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__CustomVariables.getCustomVariables_day.xml
@@ -33,6 +33,12 @@
 		</goals>
 		<nb_conversions>3</nb_conversions>
 		<revenue>3121.11</revenue>
+		<slots>
+			<row>
+				<scope>visit</scope>
+				<index>4</index>
+			</row>
+		</slots>
 		<segment>customVariableName==ValueIsZero</segment>
 		<subtable>
 			<row>
@@ -104,6 +110,12 @@
 		</goals>
 		<nb_conversions>3</nb_conversions>
 		<revenue>3121.11</revenue>
+		<slots>
+			<row>
+				<scope>visit</scope>
+				<index>5</index>
+			</row>
+		</slots>
 		<segment>customVariableName==VisitorType</segment>
 		<subtable>
 			<row>
@@ -146,6 +158,12 @@
 		<label>_pkc</label>
 		<nb_visits>7</nb_visits>
 		<nb_actions>12</nb_actions>
+		<slots>
+			<row>
+				<scope>page</scope>
+				<index>5</index>
+			</row>
+		</slots>
 		<segment>customVariableName==_pkc</segment>
 		<subtable>
 			<row>
@@ -191,6 +209,12 @@
 		<label>_pkn</label>
 		<nb_visits>6</nb_visits>
 		<nb_actions>11</nb_actions>
+		<slots>
+			<row>
+				<scope>page</scope>
+				<index>4</index>
+			</row>
+		</slots>
 		<segment>customVariableName==_pkn</segment>
 		<subtable>
 			<row>
@@ -216,6 +240,12 @@
 		<label>_pks</label>
 		<nb_visits>6</nb_visits>
 		<nb_actions>11</nb_actions>
+		<slots>
+			<row>
+				<scope>page</scope>
+				<index>3</index>
+			</row>
+		</slots>
 		<segment>customVariableName==_pks</segment>
 		<subtable>
 			<row>
@@ -265,6 +295,12 @@
 		</goals>
 		<nb_conversions>2</nb_conversions>
 		<revenue>3111.11</revenue>
+		<slots>
+			<row>
+				<scope>visit</scope>
+				<index>3</index>
+			</row>
+		</slots>
 		<segment>customVariableName==VisitorName</segment>
 		<subtable>
 			<row>
@@ -302,6 +338,12 @@
 		<label>_pkp</label>
 		<nb_visits>8</nb_visits>
 		<nb_actions>8</nb_actions>
+		<slots>
+			<row>
+				<scope>page</scope>
+				<index>2</index>
+			</row>
+		</slots>
 		<segment>customVariableName==_pkp</segment>
 		<subtable>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CustomVariables.getUsagesOfSlots.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CustomVariables.getUsagesOfSlots.xml
new file mode 100644
index 0000000000..81163427e5
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CustomVariables.getUsagesOfSlots.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<scope>visit</scope>
+		<index>1</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>visit</scope>
+		<index>2</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>visit</scope>
+		<index>3</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>visit</scope>
+		<index>4</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>visit</scope>
+		<index>5</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>1</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>2</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>3</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>4</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>5</index>
+		<usages>
+		</usages>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit__CustomVariables.getUsagesOfSlots.xml b/tests/PHPUnit/System/expected/test_noVisit__CustomVariables.getUsagesOfSlots.xml
new file mode 100644
index 0000000000..81163427e5
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit__CustomVariables.getUsagesOfSlots.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<scope>visit</scope>
+		<index>1</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>visit</scope>
+		<index>2</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>visit</scope>
+		<index>3</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>visit</scope>
+		<index>4</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>visit</scope>
+		<index>5</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>1</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>2</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>3</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>4</index>
+		<usages>
+		</usages>
+	</row>
+	<row>
+		<scope>page</scope>
+		<index>5</index>
+		<usages>
+		</usages>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
index 00acc7d7d0..8851c23d9a 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
@@ -23,6 +23,12 @@
 		<revenue>1000</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<slots>
+			<row>
+				<scope>visit</scope>
+				<index>1</index>
+			</row>
+		</slots>
 		<segment>customVariableName==VisitorType</segment>
 		<subtable>
 			<row>
@@ -88,6 +94,12 @@
 		<revenue>0</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<slots>
+			<row>
+				<scope>visit</scope>
+				<index>2</index>
+			</row>
+		</slots>
 		<segment>customVariableName==SET+WITH+EMPTY+VALUE</segment>
 		<subtable>
 			<row>
@@ -114,6 +126,16 @@
 	<row>
 		<label>Status user</label>
 		<nb_actions>3</nb_actions>
+		<slots>
+			<row>
+				<scope>page</scope>
+				<index>4</index>
+			</row>
+			<row>
+				<scope>page</scope>
+				<index>5</index>
+			</row>
+		</slots>
 		<segment>customVariableName==Status+user</segment>
 		<subtable>
 			<row>
@@ -148,6 +170,12 @@
 		<revenue>0</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<slots>
+			<row>
+				<scope>visit</scope>
+				<index>3</index>
+			</row>
+		</slots>
 		<segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment>
 		<subtable>
 			<row>
@@ -189,6 +217,12 @@
 		<revenue>1000</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<slots>
+			<row>
+				<scope>visit</scope>
+				<index>2</index>
+			</row>
+		</slots>
 		<segment>customVariableName==Othercustom+value+which+should+be+truncated+abcdefghijklmnopqrstuvwxyz</segment>
 		<subtable>
 			<row>
@@ -215,6 +249,12 @@
 	<row>
 		<label>Language</label>
 		<nb_actions>1</nb_actions>
+		<slots>
+			<row>
+				<scope>page</scope>
+				<index>1</index>
+			</row>
+		</slots>
 		<segment>customVariableName==Language</segment>
 		<subtable>
 			<row>
@@ -228,6 +268,12 @@
 	<row>
 		<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
 		<nb_actions>1</nb_actions>
+		<slots>
+			<row>
+				<scope>page</scope>
+				<index>2</index>
+			</row>
+		</slots>
 		<segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment>
 		<subtable>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml
index 00acc7d7d0..8851c23d9a 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml
@@ -23,6 +23,12 @@
 		<revenue>1000</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<slots>
+			<row>
+				<scope>visit</scope>
+				<index>1</index>
+			</row>
+		</slots>
 		<segment>customVariableName==VisitorType</segment>
 		<subtable>
 			<row>
@@ -88,6 +94,12 @@
 		<revenue>0</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<slots>
+			<row>
+				<scope>visit</scope>
+				<index>2</index>
+			</row>
+		</slots>
 		<segment>customVariableName==SET+WITH+EMPTY+VALUE</segment>
 		<subtable>
 			<row>
@@ -114,6 +126,16 @@
 	<row>
 		<label>Status user</label>
 		<nb_actions>3</nb_actions>
+		<slots>
+			<row>
+				<scope>page</scope>
+				<index>4</index>
+			</row>
+			<row>
+				<scope>page</scope>
+				<index>5</index>
+			</row>
+		</slots>
 		<segment>customVariableName==Status+user</segment>
 		<subtable>
 			<row>
@@ -148,6 +170,12 @@
 		<revenue>0</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<slots>
+			<row>
+				<scope>visit</scope>
+				<index>3</index>
+			</row>
+		</slots>
 		<segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment>
 		<subtable>
 			<row>
@@ -189,6 +217,12 @@
 		<revenue>1000</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<slots>
+			<row>
+				<scope>visit</scope>
+				<index>2</index>
+			</row>
+		</slots>
 		<segment>customVariableName==Othercustom+value+which+should+be+truncated+abcdefghijklmnopqrstuvwxyz</segment>
 		<subtable>
 			<row>
@@ -215,6 +249,12 @@
 	<row>
 		<label>Language</label>
 		<nb_actions>1</nb_actions>
+		<slots>
+			<row>
+				<scope>page</scope>
+				<index>1</index>
+			</row>
+		</slots>
 		<segment>customVariableName==Language</segment>
 		<subtable>
 			<row>
@@ -228,6 +268,12 @@
 	<row>
 		<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
 		<nb_actions>1</nb_actions>
+		<slots>
+			<row>
+				<scope>page</scope>
+				<index>2</index>
+			</row>
+		</slots>
 		<segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment>
 		<subtable>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml
index 6b7a4a8b1c..c1ba006247 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml
@@ -3,6 +3,12 @@
 	<row>
 		<label>liked</label>
 		<nb_actions>20</nb_actions>
+		<slots>
+			<row>
+				<scope>page</scope>
+				<index>4</index>
+			</row>
+		</slots>
 		<segment>customVariableName==liked</segment>
 		<subtable>
 			<row>
@@ -20,6 +26,12 @@
 	<row>
 		<label>tweeted</label>
 		<nb_actions>20</nb_actions>
+		<slots>
+			<row>
+				<scope>page</scope>
+				<index>3</index>
+			</row>
+		</slots>
 		<segment>customVariableName==tweeted</segment>
 		<subtable>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml
index 6b7a4a8b1c..c1ba006247 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml
@@ -3,6 +3,12 @@
 	<row>
 		<label>liked</label>
 		<nb_actions>20</nb_actions>
+		<slots>
+			<row>
+				<scope>page</scope>
+				<index>4</index>
+			</row>
+		</slots>
 		<segment>customVariableName==liked</segment>
 		<subtable>
 			<row>
@@ -20,6 +26,12 @@
 	<row>
 		<label>tweeted</label>
 		<nb_actions>20</nb_actions>
+		<slots>
+			<row>
+				<scope>page</scope>
+				<index>3</index>
+			</row>
+		</slots>
 		<segment>customVariableName==tweeted</segment>
 		<subtable>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml
index ebbd07023b..7ffb6725e4 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml
@@ -24,6 +24,12 @@
 				</goals>
 				<nb_conversions>3</nb_conversions>
 				<revenue>1000</revenue>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>1</index>
+					</row>
+				</slots>
 				<segment>customVariableName==VisitorType</segment>
 				<subtable>
 					<row>
@@ -86,6 +92,12 @@
 				</goals>
 				<nb_conversions>1</nb_conversions>
 				<revenue>0</revenue>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>2</index>
+					</row>
+				</slots>
 				<segment>customVariableName==SET+WITH+EMPTY+VALUE</segment>
 				<subtable>
 					<row>
@@ -125,6 +137,12 @@
 				</goals>
 				<nb_conversions>1</nb_conversions>
 				<revenue>0</revenue>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>3</index>
+					</row>
+				</slots>
 				<segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment>
 				<subtable>
 					<row>
@@ -150,6 +168,16 @@
 			<row>
 				<label>Status user</label>
 				<nb_actions>3</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>4</index>
+					</row>
+					<row>
+						<scope>page</scope>
+						<index>5</index>
+					</row>
+				</slots>
 				<segment>customVariableName==Status+user</segment>
 				<subtable>
 					<row>
@@ -181,6 +209,12 @@
 				</goals>
 				<nb_conversions>1</nb_conversions>
 				<revenue>1000</revenue>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>2</index>
+					</row>
+				</slots>
 				<segment>customVariableName==Othercustom+value+which+should+be+truncated+abcdefghijklmnopqrstuvwxyz</segment>
 				<subtable>
 					<row>
@@ -206,6 +240,12 @@
 			<row>
 				<label>Language</label>
 				<nb_actions>1</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>1</index>
+					</row>
+				</slots>
 				<segment>customVariableName==Language</segment>
 				<subtable>
 					<row>
@@ -218,6 +258,12 @@
 			<row>
 				<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
 				<nb_actions>1</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>2</index>
+					</row>
+				</slots>
 				<segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment>
 				<subtable>
 					<row>
@@ -230,6 +276,12 @@
 			<row>
 				<label>var1</label>
 				<nb_actions>1</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>2</index>
+					</row>
+				</slots>
 				<segment>customVariableName==var1</segment>
 				<subtable>
 					<row>
@@ -242,6 +294,12 @@
 			<row>
 				<label>var2</label>
 				<nb_actions>1</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>3</index>
+					</row>
+				</slots>
 				<segment>customVariableName==var2</segment>
 				<subtable>
 					<row>
@@ -254,6 +312,12 @@
 			<row>
 				<label>var3</label>
 				<nb_actions>1</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>4</index>
+					</row>
+				</slots>
 				<segment>customVariableName==var3</segment>
 				<subtable>
 					<row>
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml
index 92a4a5c7be..0514b1d5d3 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml
@@ -25,6 +25,12 @@
 				<revenue>1000</revenue>
 				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 				<sum_daily_nb_users>0</sum_daily_nb_users>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>1</index>
+					</row>
+				</slots>
 				<segment>customVariableName==VisitorType</segment>
 				<subtable>
 					<row>
@@ -90,6 +96,12 @@
 				<revenue>0</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_nb_users>0</sum_daily_nb_users>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>2</index>
+					</row>
+				</slots>
 				<segment>customVariableName==SET+WITH+EMPTY+VALUE</segment>
 				<subtable>
 					<row>
@@ -131,6 +143,12 @@
 				<revenue>0</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_nb_users>0</sum_daily_nb_users>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>3</index>
+					</row>
+				</slots>
 				<segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment>
 				<subtable>
 					<row>
@@ -157,6 +175,16 @@
 			<row>
 				<label>Status user</label>
 				<nb_actions>3</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>4</index>
+					</row>
+					<row>
+						<scope>page</scope>
+						<index>5</index>
+					</row>
+				</slots>
 				<segment>customVariableName==Status+user</segment>
 				<subtable>
 					<row>
@@ -191,6 +219,12 @@
 				<revenue>1000</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_nb_users>0</sum_daily_nb_users>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>2</index>
+					</row>
+				</slots>
 				<segment>customVariableName==Othercustom+value+which+should+be+truncated+abcdefghijklmnopqrstuvwxyz</segment>
 				<subtable>
 					<row>
@@ -217,6 +251,12 @@
 			<row>
 				<label>Language</label>
 				<nb_actions>1</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>1</index>
+					</row>
+				</slots>
 				<segment>customVariableName==Language</segment>
 				<subtable>
 					<row>
@@ -230,6 +270,12 @@
 			<row>
 				<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
 				<nb_actions>1</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>2</index>
+					</row>
+				</slots>
 				<segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment>
 				<subtable>
 					<row>
@@ -243,6 +289,12 @@
 			<row>
 				<label>var1</label>
 				<nb_actions>1</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>2</index>
+					</row>
+				</slots>
 				<segment>customVariableName==var1</segment>
 				<subtable>
 					<row>
@@ -256,6 +308,12 @@
 			<row>
 				<label>var2</label>
 				<nb_actions>1</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>3</index>
+					</row>
+				</slots>
 				<segment>customVariableName==var2</segment>
 				<subtable>
 					<row>
@@ -269,6 +327,12 @@
 			<row>
 				<label>var3</label>
 				<nb_actions>1</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>4</index>
+					</row>
+				</slots>
 				<segment>customVariableName==var3</segment>
 				<subtable>
 					<row>
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
index 7e941dea10..1bfb23612e 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
@@ -24,6 +24,12 @@
 				</goals>
 				<nb_conversions>3</nb_conversions>
 				<revenue>1000</revenue>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>1</index>
+					</row>
+				</slots>
 				<segment>customVariableName==VisitorType</segment>
 				<subtable>
 					<row>
@@ -86,6 +92,12 @@
 				</goals>
 				<nb_conversions>1</nb_conversions>
 				<revenue>0</revenue>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>2</index>
+					</row>
+				</slots>
 				<segment>customVariableName==SET+WITH+EMPTY+VALUE</segment>
 				<subtable>
 					<row>
@@ -111,6 +123,16 @@
 			<row>
 				<label>Status user</label>
 				<nb_actions>3</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>4</index>
+					</row>
+					<row>
+						<scope>page</scope>
+						<index>5</index>
+					</row>
+				</slots>
 				<segment>customVariableName==Status+user</segment>
 				<subtable>
 					<row>
@@ -142,6 +164,12 @@
 				</goals>
 				<nb_conversions>1</nb_conversions>
 				<revenue>0</revenue>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>3</index>
+					</row>
+				</slots>
 				<segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment>
 				<subtable>
 					<row>
@@ -181,6 +209,12 @@
 				</goals>
 				<nb_conversions>1</nb_conversions>
 				<revenue>1000</revenue>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>2</index>
+					</row>
+				</slots>
 				<segment>customVariableName==Othercustom+value+which+should+be+truncated+abcdefghijklmnopqrstuvwxyz</segment>
 				<subtable>
 					<row>
@@ -206,6 +240,12 @@
 			<row>
 				<label>Language</label>
 				<nb_actions>1</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>1</index>
+					</row>
+				</slots>
 				<segment>customVariableName==Language</segment>
 				<subtable>
 					<row>
@@ -218,6 +258,12 @@
 			<row>
 				<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
 				<nb_actions>1</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>2</index>
+					</row>
+				</slots>
 				<segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment>
 				<subtable>
 					<row>
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
index 54f91c076f..4041ca8eac 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
@@ -25,6 +25,12 @@
 				<revenue>1000</revenue>
 				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 				<sum_daily_nb_users>0</sum_daily_nb_users>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>1</index>
+					</row>
+				</slots>
 				<segment>customVariableName==VisitorType</segment>
 				<subtable>
 					<row>
@@ -90,6 +96,12 @@
 				<revenue>0</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_nb_users>0</sum_daily_nb_users>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>2</index>
+					</row>
+				</slots>
 				<segment>customVariableName==SET+WITH+EMPTY+VALUE</segment>
 				<subtable>
 					<row>
@@ -116,6 +128,16 @@
 			<row>
 				<label>Status user</label>
 				<nb_actions>3</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>4</index>
+					</row>
+					<row>
+						<scope>page</scope>
+						<index>5</index>
+					</row>
+				</slots>
 				<segment>customVariableName==Status+user</segment>
 				<subtable>
 					<row>
@@ -150,6 +172,12 @@
 				<revenue>0</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_nb_users>0</sum_daily_nb_users>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>3</index>
+					</row>
+				</slots>
 				<segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment>
 				<subtable>
 					<row>
@@ -191,6 +219,12 @@
 				<revenue>1000</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_nb_users>0</sum_daily_nb_users>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>2</index>
+					</row>
+				</slots>
 				<segment>customVariableName==Othercustom+value+which+should+be+truncated+abcdefghijklmnopqrstuvwxyz</segment>
 				<subtable>
 					<row>
@@ -217,6 +251,12 @@
 			<row>
 				<label>Language</label>
 				<nb_actions>1</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>1</index>
+					</row>
+				</slots>
 				<segment>customVariableName==Language</segment>
 				<subtable>
 					<row>
@@ -230,6 +270,12 @@
 			<row>
 				<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
 				<nb_actions>1</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>2</index>
+					</row>
+				</slots>
 				<segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment>
 				<subtable>
 					<row>
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
index 304bb2fe65..428f0180ae 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
@@ -19,6 +19,12 @@
 				</goals>
 				<nb_conversions>1</nb_conversions>
 				<revenue>0</revenue>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>2</index>
+					</row>
+				</slots>
 				<segment>customVariableName==SET+WITH+EMPTY+VALUE</segment>
 				<subtable>
 					<row>
@@ -44,6 +50,16 @@
 			<row>
 				<label>Status user</label>
 				<nb_actions>3</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>4</index>
+					</row>
+					<row>
+						<scope>page</scope>
+						<index>5</index>
+					</row>
+				</slots>
 				<segment>customVariableName==Status+user</segment>
 				<subtable>
 					<row>
@@ -75,6 +91,12 @@
 				</goals>
 				<nb_conversions>1</nb_conversions>
 				<revenue>0</revenue>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>3</index>
+					</row>
+				</slots>
 				<segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment>
 				<subtable>
 					<row>
@@ -119,6 +141,12 @@
 				</goals>
 				<nb_conversions>2</nb_conversions>
 				<revenue>0</revenue>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>1</index>
+					</row>
+				</slots>
 				<segment>customVariableName==VisitorType</segment>
 				<subtable>
 					<row>
@@ -157,6 +185,12 @@
 			<row>
 				<label>Language</label>
 				<nb_actions>1</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>1</index>
+					</row>
+				</slots>
 				<segment>customVariableName==Language</segment>
 				<subtable>
 					<row>
@@ -169,6 +203,12 @@
 			<row>
 				<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
 				<nb_actions>1</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>2</index>
+					</row>
+				</slots>
 				<segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment>
 				<subtable>
 					<row>
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
index c4f92b8e6b..4c0da8f95e 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
@@ -20,6 +20,12 @@
 				<revenue>0</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_nb_users>0</sum_daily_nb_users>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>2</index>
+					</row>
+				</slots>
 				<segment>customVariableName==SET+WITH+EMPTY+VALUE</segment>
 				<subtable>
 					<row>
@@ -46,6 +52,16 @@
 			<row>
 				<label>Status user</label>
 				<nb_actions>3</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>4</index>
+					</row>
+					<row>
+						<scope>page</scope>
+						<index>5</index>
+					</row>
+				</slots>
 				<segment>customVariableName==Status+user</segment>
 				<subtable>
 					<row>
@@ -80,6 +96,12 @@
 				<revenue>0</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_nb_users>0</sum_daily_nb_users>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>3</index>
+					</row>
+				</slots>
 				<segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment>
 				<subtable>
 					<row>
@@ -126,6 +148,12 @@
 				<revenue>0</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_nb_users>0</sum_daily_nb_users>
+				<slots>
+					<row>
+						<scope>visit</scope>
+						<index>1</index>
+					</row>
+				</slots>
 				<segment>customVariableName==VisitorType</segment>
 				<subtable>
 					<row>
@@ -165,6 +193,12 @@
 			<row>
 				<label>Language</label>
 				<nb_actions>1</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>1</index>
+					</row>
+				</slots>
 				<segment>customVariableName==Language</segment>
 				<subtable>
 					<row>
@@ -178,6 +212,12 @@
 			<row>
 				<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
 				<nb_actions>1</nb_actions>
+				<slots>
+					<row>
+						<scope>page</scope>
+						<index>2</index>
+					</row>
+				</slots>
 				<segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment>
 				<subtable>
 					<row>
diff --git a/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php
index c6fd94e406..057f500d18 100644
--- a/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php
@@ -96,6 +96,22 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
         return $table;
     }
 
+    protected function _getDataTableHavingAnArrayInRowMetadata()
+    {
+        $array = array(
+            array(Row::COLUMNS => array('label' => 'sub1', 'count' => 1)),
+            array(Row::COLUMNS => array('label' => 'sub2', 'count' => 2), Row::METADATA => array('test' => 'render')),
+            array(Row::COLUMNS => array('label' => 'sub3', 'count' => 2), Row::METADATA => array('test' => 'renderMe', 'testArray' => 'ignore')),
+            array(Row::COLUMNS => array('label' => 'sub4', 'count' => 6), Row::METADATA => array('testArray' => array('do not render'))),
+            array(Row::COLUMNS => array('label' => 'sub5', 'count' => 2), Row::METADATA => array('testArray' => 'do ignore', 'mymeta' => 'should be rendered')),
+            array(Row::COLUMNS => array('label' => 'sub6', 'count' => 3), Row::METADATA => array('mymeta' => 'renderrrrrr')),
+        );
+
+        $table = new DataTable();
+        $table->addRowsFromArray($array);
+
+        return $table;
+    }
 
     public function testCSVTest1()
     {
@@ -186,6 +202,25 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $actual);
     }
 
+    public function testCSVTest7_shouldNotRenderMetadataThatContainsAnArray()
+    {
+        $dataTable = $this->_getDataTableHavingAnArrayInRowMetadata();
+        $render = new Csv();
+        $render->setTable($dataTable);
+        $render->convertToUnicode = false;
+
+        // the column "testArray" should be ignored and not rendered, all other columns should be assigned correctly
+        $expected = "label,count,metadata_test,metadata_mymeta
+sub1,1,,
+sub2,2,render,
+sub3,2,renderMe,
+sub4,6,,
+sub5,2,,should be rendered
+sub6,3,,renderrrrrr";
+        $rendered = $render->render();
+        $this->assertEquals($expected, $rendered);
+    }
+
     /**
      * DATA OF DATATABLE_ARRAY
      * -------------------------