diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action.png
index b310ba150084..17fd216d7fba 100644
--- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action.png
+++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ffc39340bb0cd0fbf965ace2cbbd3f693a4fbfec3088e2aee1ab4e1c39ec6ce3
-size 24837
+oid sha256:0407bd7f4f73750434c338b2f1cf3ca3d78e91d0a8a76fce84f95a311a0eafcb
+size 25149
diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable.png
index 5c1a5af68f97..c1ff5c8baaf9 100644
--- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable.png
+++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6232ecb12ca266a5f1a9f6c1cb69ae71179a0cec6e6efacaadd16f647a4823ba
-size 52581
+oid sha256:358c7a7de6a58cc3c9b4e69ac9e4960293e7b46bcdd56735b2f45f36d42b00e2
+size 52912
diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_rowevolution.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_rowevolution.png
index 7bb4ccf5ae43..b92fb8d01b54 100644
--- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_rowevolution.png
+++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_rowevolution.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c0a74cd042a3efd88d241385b6c6d96ba6b40b87c7cafb542b8e693f0991754
-size 78119
+oid sha256:ce05ec7c081397da3edbc12d757f9083e4f3423d42f188c52f260967942b02e6
+size 77288
diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_segmented_visitor_log.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_segmented_visitor_log.png
index 793c2dd2f76a..30e6469c0280 100644
--- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_segmented_visitor_log.png
+++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_segmented_visitor_log.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e4d8b556f41edb57d5ebc5221148994575f370f18993398213e632e703a2dd5
-size 84992
+oid sha256:e1926f95d04f671b4f50dd2bb844f2071e7533ecee7ce8589aa11770fce75adb
+size 131360
diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_transitions.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_transitions.png
index 5ac9b25463e1..13fe3e21eb6a 100644
--- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_transitions.png
+++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_transitions.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04301711b0725f051ca1f2704b8fcdd8f6e54c4e6efcc41bd8b8feb777498d70
-size 48762
+oid sha256:49183582bc47c924578164fbd3dd182821f131fdd88dbf57b4bf16ae6de399a3
+size 53968
diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowactions.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowactions.png
index 2e450ce740b4..076ec319482f 100644
--- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowactions.png
+++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowactions.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ddd4079f292b793b624adce2147f1b91238d185a0409f877745c416f28db341
-size 28345
+oid sha256:a88415be07bfeb2ab747fb9fb1e192d21991bbb97d55d400038322a16478a8aa
+size 28636
diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowevolution.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowevolution.png
index eeef22f3ca02..3177dd852f15 100644
--- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowevolution.png
+++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowevolution.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec586073b672cdd8c219c3f73a60628e5ff87061c60b5683ae525222c15a70c2
-size 68264
+oid sha256:1c3f053cf790636e5b494e98da213902b63b219fe5542a7be3b7e487396c4f3c
+size 69344
diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_segmented_visitorlog.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_segmented_visitorlog.png
index 1cca0b513183..8666595075ab 100644
--- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_segmented_visitorlog.png
+++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_segmented_visitorlog.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c320d2cdaad1a8435a3d6f97e8cb7646ef03dfea3b15c786556b06ef2eb2d5c
-size 119705
+oid sha256:070e6971fd8dfeaf38e4a5964c2b639e5df939ebd889f89aa49703774da1ca75
+size 126166
diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_visit.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_visit.png
index 4bbd6f23f2d0..27647c8b6465 100644
--- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_visit.png
+++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_visit.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fbcf8ddfd87d50b8683d7f6cb1d62a5f5f28626daf4482d4c182720ce72fc5b1
-size 19862
+oid sha256:86e77d89e24722d9a53a532fbdc4e998f73bde993b7ad8dc28c7834cc8ba5869
+size 19771
diff --git a/tests/PHPUnit/System/expected/test_reportLimitingdimension_2_rankingQuery__CustomDimensions.getCustomDimension_day.xml b/tests/PHPUnit/System/expected/test_reportLimitingdimension_2_rankingQuery__CustomDimensions.getCustomDimension_day.xml
index ecd14db85aa2..10c89cde903c 100644
--- a/tests/PHPUnit/System/expected/test_reportLimitingdimension_2_rankingQuery__CustomDimensions.getCustomDimension_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimitingdimension_2_rankingQuery__CustomDimensions.getCustomDimension_day.xml
@@ -2,9 +2,9 @@
 <result>
 	<row>
 		
-		<nb_visits>2</nb_visits>
-		<nb_uniq_visitors>2</nb_uniq_visitors>
-		<nb_hits>2</nb_hits>
+		<nb_visits>5</nb_visits>
+		<nb_uniq_visitors>5</nb_uniq_visitors>
+		<nb_hits>5</nb_hits>
 		<sum_time_network>0</sum_time_network>
 		<nb_hits_with_time_network>0</nb_hits_with_time_network>
 		<min_time_network>0</min_time_network>
@@ -81,54 +81,14 @@
 				<avg_time_on_dimension>0</avg_time_on_dimension>
 				
 				
-			</row>
-			<row>
-				
-				<nb_visits>1</nb_visits>
-				<nb_uniq_visitors>1</nb_uniq_visitors>
-				<nb_hits>1</nb_hits>
-				<sum_time_network>0</sum_time_network>
-				<nb_hits_with_time_network>0</nb_hits_with_time_network>
-				<min_time_network>0</min_time_network>
-				<max_time_network>0</max_time_network>
-				<sum_time_server>0</sum_time_server>
-				<nb_hits_with_time_server>0</nb_hits_with_time_server>
-				<min_time_server>0</min_time_server>
-				<max_time_server>0</max_time_server>
-				<sum_time_transfer>0</sum_time_transfer>
-				<nb_hits_with_time_transfer>0</nb_hits_with_time_transfer>
-				<min_time_transfer>0</min_time_transfer>
-				<max_time_transfer>0</max_time_transfer>
-				<sum_time_dom_processing>0</sum_time_dom_processing>
-				<nb_hits_with_time_dom_processing>0</nb_hits_with_time_dom_processing>
-				<min_time_dom_processing>0</min_time_dom_processing>
-				<max_time_dom_processing>0</max_time_dom_processing>
-				<sum_time_dom_completion>0</sum_time_dom_completion>
-				<nb_hits_with_time_dom_completion>0</nb_hits_with_time_dom_completion>
-				<min_time_dom_completion>0</min_time_dom_completion>
-				<max_time_dom_completion>0</max_time_dom_completion>
-				<sum_time_on_load>0</sum_time_on_load>
-				<nb_hits_with_time_on_load>0</nb_hits_with_time_on_load>
-				<min_time_on_load>0</min_time_on_load>
-				<max_time_on_load>0</max_time_on_load>
-				<sum_bandwidth>0</sum_bandwidth>
-				<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
-				<min_bandwidth>0</min_bandwidth>
-				<max_bandwidth>0</max_bandwidth>
-				<sum_time_spent>0</sum_time_spent>
-				
-				
-				<avg_time_on_dimension>0</avg_time_on_dimension>
-				
-				
 			</row>
 		</subtable>
 	</row>
 	<row>
 		
-		<nb_visits>2</nb_visits>
-		<nb_uniq_visitors>2</nb_uniq_visitors>
-		<nb_hits>2</nb_hits>
+		<nb_visits>5</nb_visits>
+		<nb_uniq_visitors>5</nb_uniq_visitors>
+		<nb_hits>5</nb_hits>
 		<sum_time_network>0</sum_time_network>
 		<nb_hits_with_time_network>0</nb_hits_with_time_network>
 		<min_time_network>0</min_time_network>
@@ -254,9 +214,9 @@
 	</row>
 	<row>
 		
-		<nb_visits>96</nb_visits>
-		<nb_uniq_visitors>96</nb_uniq_visitors>
-		<nb_hits>96</nb_hits>
+		<nb_visits>90</nb_visits>
+		<nb_uniq_visitors>90</nb_uniq_visitors>
+		<nb_hits>90</nb_hits>
 		<sum_time_network>0</sum_time_network>
 		<nb_hits_with_time_network>0</nb_hits_with_time_network>
 		<min_time_network>0</min_time_network>