Refactor search category/count to not use custom variables (#15286)

* Database migration

* Populate new columns

* Refactor Dimensions

* Remove CustomVariables SearchCategory dimension

* Update query in ActionsArchiver

* New implementation of archiving for Actions.getSiteSearchCategories

* Change search_count column to integer

* Remove check for CustomVariables plugin being enabled

* Remove references to search category/custom CV constants

* Prevent undefined offset error in DataArray when row is empty

* Update system tests

* remove unused method

* fix update script

* populate sitesearch category and count in visitor details

* ignore old site search variables in visitor details

* updates some exptected test files

* Show search categroy and count in action tooltip

* append category and count to action subtitle

* fix category archiving

* update tests

* Allow segmenting by search category and count

* update tests

* fix update

* fix tests

* keep old sitesearch vars as preserved custom variable

* updates expected UI files

* fix tests

* set segment name correctly

* apply review feedback

Co-authored-by: sgiehl <stefan@matomo.org>

8 files changed, 175 insertions, 377 deletions

diff --git a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_allSitesAllDates.json b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_allSitesAllDates.json
index 46afcfc20c..71f53d2307 100755
--- a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_allSitesAllDates.json
+++ b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_allSitesAllDates.json
@@ -5233,16 +5233,14 @@
         },
         {
             "custom_float": "9 min 5s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "images",
-            "custom_var_v5": "200",
             "idaction_name_ref": "5",
             "idaction_url_ref": "6",
             "idlink_va": "4",
             "idsite": "1",
             "idvisit": "1",
             "idvisitor": "08aa728aec13d68d",
+            "search_cat": "images",
+            "search_count": "200",
             "server_time": "2017-01-02 03:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -5965,16 +5963,14 @@
         },
         {
             "custom_float": "9 min 45s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "web",
-            "custom_var_v5": "205",
             "idaction_name_ref": "3",
             "idaction_url_ref": "47",
             "idlink_va": "61",
             "idsite": "1",
             "idvisit": "15",
             "idvisitor": "0e64dad0a7ea5650",
+            "search_cat": "web",
+            "search_count": "205",
             "server_time": "2017-01-02 00:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -6474,14 +6470,14 @@
         },
         {
             "custom_float": "17 min 10s",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v5": "210",
             "idaction_name_ref": "1",
             "idaction_url_ref": "65",
             "idlink_va": "101",
             "idsite": "1",
             "idvisit": "27",
             "idvisitor": "d57f2b2bcf932329",
+            "search_cat": "",
+            "search_count": "210",
             "server_time": "2017-01-02 03:04:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -6703,16 +6699,14 @@
         },
         {
             "custom_float": "9 min 5s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "images",
-            "custom_var_v5": "200",
             "idaction_name_ref": "5",
             "idaction_url_ref": "6",
             "idlink_va": "120",
             "idsite": "1",
             "idvisit": "33",
             "idvisitor": "08aa728aec13d68d",
+            "search_cat": "images",
+            "search_count": "200",
             "server_time": "2017-01-05 03:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -7435,16 +7429,14 @@
         },
         {
             "custom_float": "9 min 45s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "web",
-            "custom_var_v5": "205",
             "idaction_name_ref": "3",
             "idaction_url_ref": "47",
             "idlink_va": "177",
             "idsite": "1",
             "idvisit": "47",
             "idvisitor": "0e64dad0a7ea5650",
+            "search_cat": "web",
+            "search_count": "205",
             "server_time": "2017-01-05 00:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -7944,14 +7936,14 @@
         },
         {
             "custom_float": "17 min 10s",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v5": "210",
             "idaction_name_ref": "1",
             "idaction_url_ref": "65",
             "idlink_va": "217",
             "idsite": "1",
             "idvisit": "59",
             "idvisitor": "d57f2b2bcf932329",
+            "search_cat": "",
+            "search_count": "210",
             "server_time": "2017-01-05 03:04:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -8173,16 +8165,14 @@
         },
         {
             "custom_float": "9 min 5s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "images",
-            "custom_var_v5": "200",
             "idaction_name_ref": "5",
             "idaction_url_ref": "6",
             "idlink_va": "236",
             "idsite": "2",
             "idvisit": "65",
             "idvisitor": "08aa728aec13d68d",
+            "search_cat": "images",
+            "search_count": "200",
             "server_time": "2017-01-05 03:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -8905,16 +8895,14 @@
         },
         {
             "custom_float": "9 min 45s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "web",
-            "custom_var_v5": "205",
             "idaction_name_ref": "3",
             "idaction_url_ref": "47",
             "idlink_va": "293",
             "idsite": "2",
             "idvisit": "79",
             "idvisitor": "0e64dad0a7ea5650",
+            "search_cat": "web",
+            "search_count": "205",
             "server_time": "2017-01-05 00:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -9414,14 +9402,14 @@
         },
         {
             "custom_float": "17 min 10s",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v5": "210",
             "idaction_name_ref": "1",
             "idaction_url_ref": "65",
             "idlink_va": "333",
             "idsite": "2",
             "idvisit": "91",
             "idvisitor": "d57f2b2bcf932329",
+            "search_cat": "",
+            "search_count": "210",
             "server_time": "2017-01-05 03:04:05",
             "time_spent_ref_action": "00:00:00"
         },
diff --git a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_anonymizeUserId.json b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_anonymizeUserId.json
index 62f0e70a97..9bab6f815b 100755
--- a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_anonymizeUserId.json
+++ b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_anonymizeUserId.json
@@ -1734,10 +1734,6 @@
         },
         {
             "custom_float": "9 min 5s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "images",
-            "custom_var_v5": "200",
             "idaction_name": "7",
             "idaction_name_ref": "5",
             "idaction_url_ref": "6",
@@ -1747,6 +1743,8 @@
             "idvisit": "1",
             "idvisitor": "08aa728aec13d68d",
             "interaction_position": "4",
+            "search_cat": "images",
+            "search_count": "200",
             "server_time": "2017-01-02 03:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -2631,10 +2629,6 @@
         },
         {
             "custom_float": "9 min 45s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "web",
-            "custom_var_v5": "205",
             "idaction_name": "48",
             "idaction_name_ref": "3",
             "idaction_url_ref": "47",
@@ -2644,6 +2638,8 @@
             "idvisit": "15",
             "idvisitor": "0e64dad0a7ea5650",
             "interaction_position": "3",
+            "search_cat": "web",
+            "search_count": "205",
             "server_time": "2017-01-02 00:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -3257,8 +3253,6 @@
         },
         {
             "custom_float": "17 min 10s",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v5": "210",
             "idaction_name": "66",
             "idaction_name_ref": "1",
             "idaction_url_ref": "65",
@@ -3268,6 +3262,8 @@
             "idvisit": "27",
             "idvisitor": "d57f2b2bcf932329",
             "interaction_position": "2",
+            "search_cat": "",
+            "search_count": "210",
             "server_time": "2017-01-02 03:04:05",
             "time_spent_ref_action": "00:00:00"
         },
diff --git a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictDate.json b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictDate.json
index 85e54dffe5..4d09f5d106 100755
--- a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictDate.json
+++ b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictDate.json
@@ -5123,16 +5123,14 @@
         },
         {
             "custom_float": "9 min 5s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "images",
-            "custom_var_v5": "200",
             "idaction_name_ref": "5",
             "idaction_url_ref": "6",
             "idlink_va": "4",
             "idsite": "1",
             "idvisit": "1",
             "idvisitor": "08aa728aec13d68d",
+            "search_cat": "images",
+            "search_count": "200",
             "server_time": "2017-01-02 03:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -5903,16 +5901,14 @@
         },
         {
             "custom_float": "9 min 45s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "web",
-            "custom_var_v5": "205",
             "idaction_name_ref": "3",
             "idaction_url_ref": "47",
             "idlink_va": "61",
             "idsite": "1",
             "idvisit": "15",
             "idvisitor": "0e64dad0a7ea5650",
+            "search_cat": "web",
+            "search_count": "205",
             "server_time": "2017-01-02 00:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -6441,14 +6437,14 @@
         },
         {
             "custom_float": "17 min 10s",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v5": "210",
             "idaction_name_ref": "1",
             "idaction_url_ref": "65",
             "idlink_va": "101",
             "idsite": "1",
             "idvisit": "27",
             "idvisitor": "d57f2b2bcf932329",
+            "search_cat": "",
+            "search_count": "210",
             "server_time": "2017-01-02 03:04:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -6697,10 +6693,6 @@
         },
         {
             "custom_float": "9 min 5s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "images",
-            "custom_var_v5": "200",
             "idaction_name": "7",
             "idaction_name_ref": "5",
             "idaction_url_ref": "6",
@@ -6710,6 +6702,8 @@
             "idvisit": "33",
             "idvisitor": "08aa728aec13d68d",
             "interaction_position": "4",
+            "search_cat": "images",
+            "search_count": "200",
             "server_time": "2017-01-05 03:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -7594,10 +7588,6 @@
         },
         {
             "custom_float": "9 min 45s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "web",
-            "custom_var_v5": "205",
             "idaction_name": "48",
             "idaction_name_ref": "3",
             "idaction_url_ref": "47",
@@ -7607,6 +7597,8 @@
             "idvisit": "47",
             "idvisitor": "0e64dad0a7ea5650",
             "interaction_position": "3",
+            "search_cat": "web",
+            "search_count": "205",
             "server_time": "2017-01-05 00:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -8220,8 +8212,6 @@
         },
         {
             "custom_float": "17 min 10s",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v5": "210",
             "idaction_name": "66",
             "idaction_name_ref": "1",
             "idaction_url_ref": "65",
@@ -8231,6 +8221,8 @@
             "idvisit": "59",
             "idvisitor": "d57f2b2bcf932329",
             "interaction_position": "2",
+            "search_cat": "",
+            "search_count": "210",
             "server_time": "2017-01-05 03:04:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -8510,10 +8502,6 @@
         },
         {
             "custom_float": "9 min 5s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "images",
-            "custom_var_v5": "200",
             "idaction_name": "7",
             "idaction_name_ref": "5",
             "idaction_url_ref": "6",
@@ -8523,6 +8511,8 @@
             "idvisit": "65",
             "idvisitor": "08aa728aec13d68d",
             "interaction_position": "4",
+            "search_cat": "images",
+            "search_count": "200",
             "server_time": "2017-01-05 03:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -9407,10 +9397,6 @@
         },
         {
             "custom_float": "9 min 45s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "web",
-            "custom_var_v5": "205",
             "idaction_name": "48",
             "idaction_name_ref": "3",
             "idaction_url_ref": "47",
@@ -9420,6 +9406,8 @@
             "idvisit": "79",
             "idvisitor": "0e64dad0a7ea5650",
             "interaction_position": "3",
+            "search_cat": "web",
+            "search_count": "205",
             "server_time": "2017-01-05 00:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -10033,8 +10021,6 @@
         },
         {
             "custom_float": "17 min 10s",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v5": "210",
             "idaction_name": "66",
             "idaction_name_ref": "1",
             "idaction_url_ref": "65",
@@ -10044,6 +10030,8 @@
             "idvisit": "91",
             "idvisitor": "d57f2b2bcf932329",
             "interaction_position": "2",
+            "search_cat": "",
+            "search_count": "210",
             "server_time": "2017-01-05 03:04:05",
             "time_spent_ref_action": "00:00:00"
         },
diff --git a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictSites.json b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictSites.json
index f18e05aeca..efbc74c61c 100755
--- a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictSites.json
+++ b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictSites.json
@@ -5187,16 +5187,14 @@
         },
         {
             "custom_float": "9 min 5s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "images",
-            "custom_var_v5": "200",
             "idaction_name_ref": "5",
             "idaction_url_ref": "6",
             "idlink_va": "4",
             "idsite": "1",
             "idvisit": "1",
             "idvisitor": "08aa728aec13d68d",
+            "search_cat": "images",
+            "search_count": "200",
             "server_time": "2017-01-02 03:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -5919,16 +5917,14 @@
         },
         {
             "custom_float": "9 min 45s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "web",
-            "custom_var_v5": "205",
             "idaction_name_ref": "3",
             "idaction_url_ref": "47",
             "idlink_va": "61",
             "idsite": "1",
             "idvisit": "15",
             "idvisitor": "0e64dad0a7ea5650",
+            "search_cat": "web",
+            "search_count": "205",
             "server_time": "2017-01-02 00:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -6428,14 +6424,14 @@
         },
         {
             "custom_float": "17 min 10s",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v5": "210",
             "idaction_name_ref": "1",
             "idaction_url_ref": "65",
             "idlink_va": "101",
             "idsite": "1",
             "idvisit": "27",
             "idvisitor": "d57f2b2bcf932329",
+            "search_cat": "",
+            "search_count": "210",
             "server_time": "2017-01-02 03:04:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -6657,16 +6653,14 @@
         },
         {
             "custom_float": "9 min 5s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "images",
-            "custom_var_v5": "200",
             "idaction_name_ref": "5",
             "idaction_url_ref": "6",
             "idlink_va": "120",
             "idsite": "1",
             "idvisit": "33",
             "idvisitor": "08aa728aec13d68d",
+            "search_cat": "images",
+            "search_count": "200",
             "server_time": "2017-01-05 03:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -7389,16 +7383,14 @@
         },
         {
             "custom_float": "9 min 45s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "web",
-            "custom_var_v5": "205",
             "idaction_name_ref": "3",
             "idaction_url_ref": "47",
             "idlink_va": "177",
             "idsite": "1",
             "idvisit": "47",
             "idvisitor": "0e64dad0a7ea5650",
+            "search_cat": "web",
+            "search_count": "205",
             "server_time": "2017-01-05 00:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -7898,14 +7890,14 @@
         },
         {
             "custom_float": "17 min 10s",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v5": "210",
             "idaction_name_ref": "1",
             "idaction_url_ref": "65",
             "idlink_va": "217",
             "idsite": "1",
             "idvisit": "59",
             "idvisitor": "d57f2b2bcf932329",
+            "search_cat": "",
+            "search_count": "210",
             "server_time": "2017-01-05 03:04:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -8136,10 +8128,6 @@
         },
         {
             "custom_float": "9 min 5s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "images",
-            "custom_var_v5": "200",
             "idaction_name": "7",
             "idaction_name_ref": "5",
             "idaction_url_ref": "6",
@@ -8149,6 +8137,8 @@
             "idvisit": "65",
             "idvisitor": "08aa728aec13d68d",
             "interaction_position": "4",
+            "search_cat": "images",
+            "search_count": "200",
             "server_time": "2017-01-05 03:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -9033,10 +9023,6 @@
         },
         {
             "custom_float": "9 min 45s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "web",
-            "custom_var_v5": "205",
             "idaction_name": "48",
             "idaction_name_ref": "3",
             "idaction_url_ref": "47",
@@ -9046,6 +9032,8 @@
             "idvisit": "79",
             "idvisitor": "0e64dad0a7ea5650",
             "interaction_position": "3",
+            "search_cat": "web",
+            "search_count": "205",
             "server_time": "2017-01-05 00:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -9659,8 +9647,6 @@
         },
         {
             "custom_float": "17 min 10s",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v5": "210",
             "idaction_name": "66",
             "idaction_name_ref": "1",
             "idaction_url_ref": "65",
@@ -9670,6 +9656,8 @@
             "idvisit": "91",
             "idvisitor": "d57f2b2bcf932329",
             "interaction_position": "2",
+            "search_cat": "",
+            "search_count": "210",
             "server_time": "2017-01-05 03:04:05",
             "time_spent_ref_action": "00:00:00"
         },
diff --git a/plugins/PrivacyManager/tests/System/expected/exportDataSubject_allVisits.json b/plugins/PrivacyManager/tests/System/expected/exportDataSubject_allVisits.json
index 601510ecb3..8828d32ed2 100755
--- a/plugins/PrivacyManager/tests/System/expected/exportDataSubject_allVisits.json
+++ b/plugins/PrivacyManager/tests/System/expected/exportDataSubject_allVisits.json
@@ -11844,10 +11844,6 @@
         },
         {
             "custom_float": "9 min 5s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "images",
-            "custom_var_v5": "200",
             "idaction_name": "7",
             "idaction_name_ref": "5",
             "idaction_url_ref": "6",
@@ -11857,6 +11853,8 @@
             "idvisit": "1",
             "idvisitor": "08aa728aec13d68d",
             "interaction_position": "4",
+            "search_cat": "images",
+            "search_count": "200",
             "server_time": "2017-01-02 03:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -12741,10 +12739,6 @@
         },
         {
             "custom_float": "9 min 45s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "web",
-            "custom_var_v5": "205",
             "idaction_name": "48",
             "idaction_name_ref": "3",
             "idaction_url_ref": "47",
@@ -12754,6 +12748,8 @@
             "idvisit": "15",
             "idvisitor": "0e64dad0a7ea5650",
             "interaction_position": "3",
+            "search_cat": "web",
+            "search_count": "205",
             "server_time": "2017-01-02 00:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -13367,8 +13363,6 @@
         },
         {
             "custom_float": "17 min 10s",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v5": "210",
             "idaction_name": "66",
             "idaction_name_ref": "1",
             "idaction_url_ref": "65",
@@ -13378,6 +13372,8 @@
             "idvisit": "27",
             "idvisitor": "d57f2b2bcf932329",
             "interaction_position": "2",
+            "search_cat": "",
+            "search_count": "210",
             "server_time": "2017-01-02 03:04:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -13657,10 +13653,6 @@
         },
         {
             "custom_float": "9 min 5s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "images",
-            "custom_var_v5": "200",
             "idaction_name": "7",
             "idaction_name_ref": "5",
             "idaction_url_ref": "6",
@@ -13670,6 +13662,8 @@
             "idvisit": "33",
             "idvisitor": "08aa728aec13d68d",
             "interaction_position": "4",
+            "search_cat": "images",
+            "search_count": "200",
             "server_time": "2017-01-05 03:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -14554,10 +14548,6 @@
         },
         {
             "custom_float": "9 min 45s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "web",
-            "custom_var_v5": "205",
             "idaction_name": "48",
             "idaction_name_ref": "3",
             "idaction_url_ref": "47",
@@ -14567,6 +14557,8 @@
             "idvisit": "47",
             "idvisitor": "0e64dad0a7ea5650",
             "interaction_position": "3",
+            "search_cat": "web",
+            "search_count": "205",
             "server_time": "2017-01-05 00:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -15180,8 +15172,6 @@
         },
         {
             "custom_float": "17 min 10s",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v5": "210",
             "idaction_name": "66",
             "idaction_name_ref": "1",
             "idaction_url_ref": "65",
@@ -15191,6 +15181,8 @@
             "idvisit": "59",
             "idvisitor": "d57f2b2bcf932329",
             "interaction_position": "2",
+            "search_cat": "",
+            "search_count": "210",
             "server_time": "2017-01-05 03:04:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -15470,10 +15462,6 @@
         },
         {
             "custom_float": "9 min 5s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "images",
-            "custom_var_v5": "200",
             "idaction_name": "7",
             "idaction_name_ref": "5",
             "idaction_url_ref": "6",
@@ -15483,6 +15471,8 @@
             "idvisit": "65",
             "idvisitor": "08aa728aec13d68d",
             "interaction_position": "4",
+            "search_cat": "images",
+            "search_count": "200",
             "server_time": "2017-01-08 03:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -16367,10 +16357,6 @@
         },
         {
             "custom_float": "9 min 45s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "web",
-            "custom_var_v5": "205",
             "idaction_name": "48",
             "idaction_name_ref": "3",
             "idaction_url_ref": "47",
@@ -16380,6 +16366,8 @@
             "idvisit": "79",
             "idvisitor": "0e64dad0a7ea5650",
             "interaction_position": "3",
+            "search_cat": "web",
+            "search_count": "205",
             "server_time": "2017-01-08 00:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -16993,8 +16981,6 @@
         },
         {
             "custom_float": "17 min 10s",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v5": "210",
             "idaction_name": "66",
             "idaction_name_ref": "1",
             "idaction_url_ref": "65",
@@ -17004,6 +16990,8 @@
             "idvisit": "91",
             "idvisitor": "d57f2b2bcf932329",
             "interaction_position": "2",
+            "search_cat": "",
+            "search_count": "210",
             "server_time": "2017-01-08 03:04:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -17283,10 +17271,6 @@
         },
         {
             "custom_float": "9 min 5s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "images",
-            "custom_var_v5": "200",
             "idaction_name": "7",
             "idaction_name_ref": "5",
             "idaction_url_ref": "6",
@@ -17296,6 +17280,8 @@
             "idvisit": "97",
             "idvisitor": "08aa728aec13d68d",
             "interaction_position": "4",
+            "search_cat": "images",
+            "search_count": "200",
             "server_time": "2017-01-11 03:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -18180,10 +18166,6 @@
         },
         {
             "custom_float": "9 min 45s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "web",
-            "custom_var_v5": "205",
             "idaction_name": "48",
             "idaction_name_ref": "3",
             "idaction_url_ref": "47",
@@ -18193,6 +18175,8 @@
             "idvisit": "111",
             "idvisitor": "0e64dad0a7ea5650",
             "interaction_position": "3",
+            "search_cat": "web",
+            "search_count": "205",
             "server_time": "2017-01-11 00:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -18806,8 +18790,6 @@
         },
         {
             "custom_float": "17 min 10s",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v5": "210",
             "idaction_name": "66",
             "idaction_name_ref": "1",
             "idaction_url_ref": "65",
@@ -18817,6 +18799,8 @@
             "idvisit": "123",
             "idvisitor": "d57f2b2bcf932329",
             "interaction_position": "2",
+            "search_cat": "",
+            "search_count": "210",
             "server_time": "2017-01-11 03:04:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -19096,10 +19080,6 @@
         },
         {
             "custom_float": "9 min 5s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "images",
-            "custom_var_v5": "200",
             "idaction_name": "7",
             "idaction_name_ref": "5",
             "idaction_url_ref": "6",
@@ -19109,6 +19089,8 @@
             "idvisit": "129",
             "idvisitor": "08aa728aec13d68d",
             "interaction_position": "4",
+            "search_cat": "images",
+            "search_count": "200",
             "server_time": "2017-01-11 03:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -19993,10 +19975,6 @@
         },
         {
             "custom_float": "9 min 45s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "web",
-            "custom_var_v5": "205",
             "idaction_name": "48",
             "idaction_name_ref": "3",
             "idaction_url_ref": "47",
@@ -20006,6 +19984,8 @@
             "idvisit": "143",
             "idvisitor": "0e64dad0a7ea5650",
             "interaction_position": "3",
+            "search_cat": "web",
+            "search_count": "205",
             "server_time": "2017-01-11 00:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -20619,8 +20599,6 @@
         },
         {
             "custom_float": "17 min 10s",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v5": "210",
             "idaction_name": "66",
             "idaction_name_ref": "1",
             "idaction_url_ref": "65",
@@ -20630,6 +20608,8 @@
             "idvisit": "155",
             "idvisitor": "d57f2b2bcf932329",
             "interaction_position": "2",
+            "search_cat": "",
+            "search_count": "210",
             "server_time": "2017-01-11 03:04:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -20909,10 +20889,6 @@
         },
         {
             "custom_float": "9 min 5s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "images",
-            "custom_var_v5": "200",
             "idaction_name": "7",
             "idaction_name_ref": "5",
             "idaction_url_ref": "6",
@@ -20922,6 +20898,8 @@
             "idvisit": "161",
             "idvisitor": "08aa728aec13d68d",
             "interaction_position": "4",
+            "search_cat": "images",
+            "search_count": "200",
             "server_time": "2017-01-11 03:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -21806,10 +21784,6 @@
         },
         {
             "custom_float": "9 min 45s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "web",
-            "custom_var_v5": "205",
             "idaction_name": "48",
             "idaction_name_ref": "3",
             "idaction_url_ref": "47",
@@ -21819,6 +21793,8 @@
             "idvisit": "175",
             "idvisitor": "0e64dad0a7ea5650",
             "interaction_position": "3",
+            "search_cat": "web",
+            "search_count": "205",
             "server_time": "2017-01-11 00:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -22432,8 +22408,6 @@
         },
         {
             "custom_float": "17 min 10s",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v5": "210",
             "idaction_name": "66",
             "idaction_name_ref": "1",
             "idaction_url_ref": "65",
@@ -22443,6 +22417,8 @@
             "idvisit": "187",
             "idvisitor": "d57f2b2bcf932329",
             "interaction_position": "2",
+            "search_cat": "",
+            "search_count": "210",
             "server_time": "2017-01-11 03:04:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -22722,10 +22698,6 @@
         },
         {
             "custom_float": "9 min 5s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "images",
-            "custom_var_v5": "200",
             "idaction_name": "7",
             "idaction_name_ref": "5",
             "idaction_url_ref": "6",
@@ -22735,6 +22707,8 @@
             "idvisit": "193",
             "idvisitor": "08aa728aec13d68d",
             "interaction_position": "4",
+            "search_cat": "images",
+            "search_count": "200",
             "server_time": "2017-01-05 03:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -23619,10 +23593,6 @@
         },
         {
             "custom_float": "9 min 45s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "web",
-            "custom_var_v5": "205",
             "idaction_name": "48",
             "idaction_name_ref": "3",
             "idaction_url_ref": "47",
@@ -23632,6 +23602,8 @@
             "idvisit": "207",
             "idvisitor": "0e64dad0a7ea5650",
             "interaction_position": "3",
+            "search_cat": "web",
+            "search_count": "205",
             "server_time": "2017-01-05 00:10:05",
             "time_spent_ref_action": "00:00:00"
         },
@@ -24245,8 +24217,6 @@
         },
         {
             "custom_float": "17 min 10s",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v5": "210",
             "idaction_name": "66",
             "idaction_name_ref": "1",
             "idaction_url_ref": "65",
@@ -24256,6 +24226,8 @@
             "idvisit": "219",
             "idvisitor": "d57f2b2bcf932329",
             "interaction_position": "2",
+            "search_cat": "",
+            "search_count": "210",
             "server_time": "2017-01-05 03:04:05",
             "time_spent_ref_action": "00:00:00"
         },
diff --git a/plugins/PrivacyManager/tests/System/expected/exportDataSubject_oneVisitGiven.json b/plugins/PrivacyManager/tests/System/expected/exportDataSubject_oneVisitGiven.json
index dafc4ae2c2..04f156202e 100755
--- a/plugins/PrivacyManager/tests/System/expected/exportDataSubject_oneVisitGiven.json
+++ b/plugins/PrivacyManager/tests/System/expected/exportDataSubject_oneVisitGiven.json
@@ -101,10 +101,6 @@
         },
         {
             "custom_float": "9 min 5s",
-            "custom_var_k4": "_pk_scat",
-            "custom_var_k5": "_pk_scount",
-            "custom_var_v4": "images",
-            "custom_var_v5": "200",
             "idaction_name": "7",
             "idaction_name_ref": "5",
             "idaction_url_ref": "6",
@@ -114,6 +110,8 @@
             "idvisit": "1",
             "idvisitor": "08aa728aec13d68d",
             "interaction_position": "4",
+            "search_cat": "images",
+            "search_count": "200",
             "server_time": "2017-01-02 03:10:05",
             "time_spent_ref_action": "00:00:00"
         },
diff --git a/plugins/PrivacyManager/tests/System/expected/test___PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml b/plugins/PrivacyManager/tests/System/expected/test___PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml
index e552d62330..da3d21a6ab 100644
--- a/plugins/PrivacyManager/tests/System/expected/test___PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml
+++ b/plugins/PrivacyManager/tests/System/expected/test___PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml
@@ -117,6 +117,14 @@
 		<default_value />
 	</row>
 	<row>
+		<column_name>search_cat</column_name>
+		<default_value />
+	</row>
+	<row>
+		<column_name>search_count</column_name>
+		<default_value />
+	</row>
+	<row>
 		<column_name>time_spent</column_name>
 		<default_value />
 	</row>
diff --git a/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml b/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml
index 87dff606d2..82d5c09856 100644
--- a/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml
+++ b/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml
@@ -94,24 +94,16 @@
 				<pageId>352</pageId>
 				<bandwidth />
 				<siteSearchKeyword>mobile</siteSearchKeyword>
+				<siteSearchCategory>images</siteSearchCategory>
+				<siteSearchCount>200</siteSearchCount>
 				<generationTimeMilliseconds>545</generationTimeMilliseconds>
 				<generationTime>0.55s</generationTime>
 				<interactionPosition>4</interactionPosition>
 				<icon>plugins/Morpheus/images/search.png</icon>
 				<iconSVG>plugins/Morpheus/images/search.svg</iconSVG>
 				<title>Site Search</title>
-				<subtitle>mobile</subtitle>
+				<subtitle>mobile - Search Category: images - Search Results Count: 200</subtitle>
 				
-				<customVariables>
-					<row>
-						<customVariablePageName4>Search Category</customVariablePageName4>
-						<customVariablePageValue4>images</customVariablePageValue4>
-					</row>
-					<row>
-						<customVariablePageName5>Search Results Count</customVariablePageName5>
-						<customVariablePageValue5>200</customVariablePageValue5>
-					</row>
-				</customVariables>
 				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
@@ -1640,24 +1632,16 @@
 				<pageId>468</pageId>
 				<bandwidth />
 				<siteSearchKeyword>mobile</siteSearchKeyword>
+				<siteSearchCategory>images</siteSearchCategory>
+				<siteSearchCount>200</siteSearchCount>
 				<generationTimeMilliseconds>545</generationTimeMilliseconds>
 				<generationTime>0.55s</generationTime>
 				<interactionPosition>4</interactionPosition>
 				<icon>plugins/Morpheus/images/search.png</icon>
 				<iconSVG>plugins/Morpheus/images/search.svg</iconSVG>
 				<title>Site Search</title>
-				<subtitle>mobile</subtitle>
+				<subtitle>mobile - Search Category: images - Search Results Count: 200</subtitle>
 				
-				<customVariables>
-					<row>
-						<customVariablePageName4>Search Category</customVariablePageName4>
-						<customVariablePageValue4>images</customVariablePageValue4>
-					</row>
-					<row>
-						<customVariablePageName5>Search Results Count</customVariablePageName5>
-						<customVariablePageValue5>200</customVariablePageValue5>
-					</row>
-				</customVariables>
 				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
@@ -3186,24 +3170,16 @@
 				<pageId>584</pageId>
 				<bandwidth />
 				<siteSearchKeyword>mobile</siteSearchKeyword>
+				<siteSearchCategory>images</siteSearchCategory>
+				<siteSearchCount>200</siteSearchCount>
 				<generationTimeMilliseconds>545</generationTimeMilliseconds>
 				<generationTime>0.55s</generationTime>
 				<interactionPosition>4</interactionPosition>
 				<icon>plugins/Morpheus/images/search.png</icon>
 				<iconSVG>plugins/Morpheus/images/search.svg</iconSVG>
 				<title>Site Search</title>
-				<subtitle>mobile</subtitle>
+				<subtitle>mobile - Search Category: images - Search Results Count: 200</subtitle>
 				
-				<customVariables>
-					<row>
-						<customVariablePageName4>Search Category</customVariablePageName4>
-						<customVariablePageValue4>images</customVariablePageValue4>
-					</row>
-					<row>
-						<customVariablePageName5>Search Results Count</customVariablePageName5>
-						<customVariablePageValue5>200</customVariablePageValue5>
-					</row>
-				</customVariables>
 				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
@@ -5367,20 +5343,16 @@
 				<timeSpent>0</timeSpent>
 				<timeSpentPretty>0s</timeSpentPretty>
 				<siteSearchKeyword>analytics</siteSearchKeyword>
+				<siteSearchCategory />
+				<siteSearchCount>210</siteSearchCount>
 				<generationTimeMilliseconds>1030</generationTimeMilliseconds>
 				<generationTime>1.03s</generationTime>
 				<interactionPosition>2</interactionPosition>
 				<icon>plugins/Morpheus/images/search.png</icon>
 				<iconSVG>plugins/Morpheus/images/search.svg</iconSVG>
 				<title>Site Search</title>
-				<subtitle>analytics</subtitle>
+				<subtitle>analytics - Search Results Count: 210</subtitle>
 				
-				<customVariables>
-					<row>
-						<customVariablePageName5>Search Results Count</customVariablePageName5>
-						<customVariablePageValue5>210</customVariablePageValue5>
-					</row>
-				</customVariables>
 				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
@@ -6319,20 +6291,16 @@
 				<timeSpent>0</timeSpent>
 				<timeSpentPretty>0s</timeSpentPretty>
 				<siteSearchKeyword>analytics</siteSearchKeyword>
+				<siteSearchCategory />
+				<siteSearchCount>210</siteSearchCount>
 				<generationTimeMilliseconds>1030</generationTimeMilliseconds>
 				<generationTime>1.03s</generationTime>
 				<interactionPosition>2</interactionPosition>
 				<icon>plugins/Morpheus/images/search.png</icon>
 				<iconSVG>plugins/Morpheus/images/search.svg</iconSVG>
 				<title>Site Search</title>
-				<subtitle>analytics</subtitle>
+				<subtitle>analytics - Search Results Count: 210</subtitle>
 				
-				<customVariables>
-					<row>
-						<customVariablePageName5>Search Results Count</customVariablePageName5>
-						<customVariablePageValue5>210</customVariablePageValue5>
-					</row>
-				</customVariables>
 				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
@@ -7271,20 +7239,16 @@
 				<timeSpent>0</timeSpent>
 				<timeSpentPretty>0s</timeSpentPretty>
 				<siteSearchKeyword>analytics</siteSearchKeyword>
+				<siteSearchCategory />
+				<siteSearchCount>210</siteSearchCount>
 				<generationTimeMilliseconds>1030</generationTimeMilliseconds>
 				<generationTime>1.03s</generationTime>
 				<interactionPosition>2</interactionPosition>
 				<icon>plugins/Morpheus/images/search.png</icon>
 				<iconSVG>plugins/Morpheus/images/search.svg</iconSVG>
 				<title>Site Search</title>
-				<subtitle>analytics</subtitle>
+				<subtitle>analytics - Search Results Count: 210</subtitle>
 				
-				<customVariables>
-					<row>
-						<customVariablePageName5>Search Results Count</customVariablePageName5>
-						<customVariablePageValue5>210</customVariablePageValue5>
-					</row>
-				</customVariables>
 				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
@@ -10408,24 +10372,16 @@
 				<pageId>409</pageId>
 				<bandwidth />
 				<siteSearchKeyword>ecommerce</siteSearchKeyword>
+				<siteSearchCategory>web</siteSearchCategory>
+				<siteSearchCount>205</siteSearchCount>
 				<generationTimeMilliseconds>585</generationTimeMilliseconds>
 				<generationTime>0.59s</generationTime>
 				<interactionPosition>3</interactionPosition>
 				<icon>plugins/Morpheus/images/search.png</icon>
 				<iconSVG>plugins/Morpheus/images/search.svg</iconSVG>
 				<title>Site Search</title>
-				<subtitle>ecommerce</subtitle>
+				<subtitle>ecommerce - Search Category: web - Search Results Count: 205</subtitle>
 				
-				<customVariables>
-					<row>
-						<customVariablePageName4>Search Category</customVariablePageName4>
-						<customVariablePageValue4>web</customVariablePageValue4>
-					</row>
-					<row>
-						<customVariablePageName5>Search Results Count</customVariablePageName5>
-						<customVariablePageValue5>205</customVariablePageValue5>
-					</row>
-				</customVariables>
 				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
@@ -10951,24 +10907,16 @@
 				<pageId>525</pageId>
 				<bandwidth />
 				<siteSearchKeyword>ecommerce</siteSearchKeyword>
+				<siteSearchCategory>web</siteSearchCategory>
+				<siteSearchCount>205</siteSearchCount>
 				<generationTimeMilliseconds>585</generationTimeMilliseconds>
 				<generationTime>0.59s</generationTime>
 				<interactionPosition>3</interactionPosition>
 				<icon>plugins/Morpheus/images/search.png</icon>
 				<iconSVG>plugins/Morpheus/images/search.svg</iconSVG>
 				<title>Site Search</title>
-				<subtitle>ecommerce</subtitle>
+				<subtitle>ecommerce - Search Category: web - Search Results Count: 205</subtitle>
 				
-				<customVariables>
-					<row>
-						<customVariablePageName4>Search Category</customVariablePageName4>
-						<customVariablePageValue4>web</customVariablePageValue4>
-					</row>
-					<row>
-						<customVariablePageName5>Search Results Count</customVariablePageName5>
-						<customVariablePageValue5>205</customVariablePageValue5>
-					</row>
-				</customVariables>
 				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
@@ -11494,24 +11442,16 @@
 				<pageId>641</pageId>
 				<bandwidth />
 				<siteSearchKeyword>ecommerce</siteSearchKeyword>
+				<siteSearchCategory>web</siteSearchCategory>
+				<siteSearchCount>205</siteSearchCount>
 				<generationTimeMilliseconds>585</generationTimeMilliseconds>
 				<generationTime>0.59s</generationTime>
 				<interactionPosition>3</interactionPosition>
 				<icon>plugins/Morpheus/images/search.png</icon>
 				<iconSVG>plugins/Morpheus/images/search.svg</iconSVG>
 				<title>Site Search</title>
-				<subtitle>ecommerce</subtitle>
+				<subtitle>ecommerce - Search Category: web - Search Results Count: 205</subtitle>
 				
-				<customVariables>
-					<row>
-						<customVariablePageName4>Search Category</customVariablePageName4>
-						<customVariablePageValue4>web</customVariablePageValue4>
-					</row>
-					<row>
-						<customVariablePageName5>Search Results Count</customVariablePageName5>
-						<customVariablePageValue5>205</customVariablePageValue5>
-					</row>
-				</customVariables>
 				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
@@ -18429,24 +18369,16 @@
 				<pageId>236</pageId>
 				<bandwidth />
 				<siteSearchKeyword>mobile</siteSearchKeyword>
+				<siteSearchCategory>images</siteSearchCategory>
+				<siteSearchCount>200</siteSearchCount>
 				<generationTimeMilliseconds>545</generationTimeMilliseconds>
 				<generationTime>0.55s</generationTime>
 				<interactionPosition>4</interactionPosition>
 				<icon>plugins/Morpheus/images/search.png</icon>
 				<iconSVG>plugins/Morpheus/images/search.svg</iconSVG>
 				<title>Site Search</title>
-				<subtitle>mobile</subtitle>
+				<subtitle>mobile - Search Category: images - Search Results Count: 200</subtitle>
 				
-				<customVariables>
-					<row>
-						<customVariablePageName4>Search Category</customVariablePageName4>
-						<customVariablePageValue4>images</customVariablePageValue4>
-					</row>
-					<row>
-						<customVariablePageName5>Search Results Count</customVariablePageName5>
-						<customVariablePageValue5>200</customVariablePageValue5>
-					</row>
-				</customVariables>
 				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
@@ -20610,20 +20542,16 @@
 				<timeSpent>0</timeSpent>
 				<timeSpentPretty>0s</timeSpentPretty>
 				<siteSearchKeyword>analytics</siteSearchKeyword>
+				<siteSearchCategory />
+				<siteSearchCount>210</siteSearchCount>
 				<generationTimeMilliseconds>1030</generationTimeMilliseconds>
 				<generationTime>1.03s</generationTime>
 				<interactionPosition>2</interactionPosition>
 				<icon>plugins/Morpheus/images/search.png</icon>
 				<iconSVG>plugins/Morpheus/images/search.svg</iconSVG>
 				<title>Site Search</title>
-				<subtitle>analytics</subtitle>
+				<subtitle>analytics - Search Results Count: 210</subtitle>
 				
-				<customVariables>
-					<row>
-						<customVariablePageName5>Search Results Count</customVariablePageName5>
-						<customVariablePageValue5>210</customVariablePageValue5>
-					</row>
-				</customVariables>
 				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
@@ -21933,24 +21861,16 @@
 				<pageId>293</pageId>
 				<bandwidth />
 				<siteSearchKeyword>ecommerce</siteSearchKeyword>
+				<siteSearchCategory>web</siteSearchCategory>
+				<siteSearchCount>205</siteSearchCount>
 				<generationTimeMilliseconds>585</generationTimeMilliseconds>
 				<generationTime>0.59s</generationTime>
 				<interactionPosition>3</interactionPosition>
 				<icon>plugins/Morpheus/images/search.png</icon>
 				<iconSVG>plugins/Morpheus/images/search.svg</iconSVG>
 				<title>Site Search</title>
-				<subtitle>ecommerce</subtitle>
+				<subtitle>ecommerce - Search Category: web - Search Results Count: 205</subtitle>
 				
-				<customVariables>
-					<row>
-						<customVariablePageName4>Search Category</customVariablePageName4>
-						<customVariablePageValue4>web</customVariablePageValue4>
-					</row>
-					<row>
-						<customVariablePageName5>Search Results Count</customVariablePageName5>
-						<customVariablePageValue5>205</customVariablePageValue5>
-					</row>
-				</customVariables>
 				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
@@ -24502,24 +24422,16 @@
 				<pageId>120</pageId>
 				<bandwidth />
 				<siteSearchKeyword>mobile</siteSearchKeyword>
+				<siteSearchCategory>images</siteSearchCategory>
+				<siteSearchCount>200</siteSearchCount>
 				<generationTimeMilliseconds>545</generationTimeMilliseconds>
 				<generationTime>0.55s</generationTime>
 				<interactionPosition>4</interactionPosition>
 				<icon>plugins/Morpheus/images/search.png</icon>
 				<iconSVG>plugins/Morpheus/images/search.svg</iconSVG>
 				<title>Site Search</title>
-				<subtitle>mobile</subtitle>
+				<subtitle>mobile - Search Category: images - Search Results Count: 200</subtitle>
 				
-				<customVariables>
-					<row>
-						<customVariablePageName4>Search Category</customVariablePageName4>
-						<customVariablePageValue4>images</customVariablePageValue4>
-					</row>
-					<row>
-						<customVariablePageName5>Search Results Count</customVariablePageName5>
-						<customVariablePageValue5>200</customVariablePageValue5>
-					</row>
-				</customVariables>
 				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
@@ -26048,24 +25960,16 @@
 				<pageId>700</pageId>
 				<bandwidth />
 				<siteSearchKeyword>mobile</siteSearchKeyword>
+				<siteSearchCategory>images</siteSearchCategory>
+				<siteSearchCount>200</siteSearchCount>
 				<generationTimeMilliseconds>545</generationTimeMilliseconds>
 				<generationTime>0.55s</generationTime>
 				<interactionPosition>4</interactionPosition>
 				<icon>plugins/Morpheus/images/search.png</icon>
 				<iconSVG>plugins/Morpheus/images/search.svg</iconSVG>
 				<title>Site Search</title>
-				<subtitle>mobile</subtitle>
+				<subtitle>mobile - Search Category: images - Search Results Count: 200</subtitle>
 				
-				<customVariables>
-					<row>
-						<customVariablePageName4>Search Category</customVariablePageName4>
-						<customVariablePageValue4>images</customVariablePageValue4>
-					</row>
-					<row>
-						<customVariablePageName5>Search Results Count</customVariablePageName5>
-						<customVariablePageValue5>200</customVariablePageValue5>
-					</row>
-				</customVariables>
 				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
@@ -28229,20 +28133,16 @@
 				<timeSpent>0</timeSpent>
 				<timeSpentPretty>0s</timeSpentPretty>
 				<siteSearchKeyword>analytics</siteSearchKeyword>
+				<siteSearchCategory />
+				<siteSearchCount>210</siteSearchCount>
 				<generationTimeMilliseconds>1030</generationTimeMilliseconds>
 				<generationTime>1.03s</generationTime>
 				<interactionPosition>2</interactionPosition>
 				<icon>plugins/Morpheus/images/search.png</icon>
 				<iconSVG>plugins/Morpheus/images/search.svg</iconSVG>
 				<title>Site Search</title>
-				<subtitle>analytics</subtitle>
+				<subtitle>analytics - Search Results Count: 210</subtitle>
 				
-				<customVariables>
-					<row>
-						<customVariablePageName5>Search Results Count</customVariablePageName5>
-						<customVariablePageValue5>210</customVariablePageValue5>
-					</row>
-				</customVariables>
 				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
@@ -29181,20 +29081,16 @@
 				<timeSpent>0</timeSpent>
 				<timeSpentPretty>0s</timeSpentPretty>
 				<siteSearchKeyword>analytics</siteSearchKeyword>
+				<siteSearchCategory />
+				<siteSearchCount>210</siteSearchCount>
 				<generationTimeMilliseconds>1030</generationTimeMilliseconds>
 				<generationTime>1.03s</generationTime>
 				<interactionPosition>2</interactionPosition>
 				<icon>plugins/Morpheus/images/search.png</icon>
 				<iconSVG>plugins/Morpheus/images/search.svg</iconSVG>
 				<title>Site Search</title>
-				<subtitle>analytics</subtitle>
+				<subtitle>analytics - Search Results Count: 210</subtitle>
 				
-				<customVariables>
-					<row>
-						<customVariablePageName5>Search Results Count</customVariablePageName5>
-						<customVariablePageValue5>210</customVariablePageValue5>
-					</row>
-				</customVariables>
 				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
@@ -31382,24 +31278,16 @@
 				<pageId>177</pageId>
 				<bandwidth />
 				<siteSearchKeyword>ecommerce</siteSearchKeyword>
+				<siteSearchCategory>web</siteSearchCategory>
+				<siteSearchCount>205</siteSearchCount>
 				<generationTimeMilliseconds>585</generationTimeMilliseconds>
 				<generationTime>0.59s</generationTime>
 				<interactionPosition>3</interactionPosition>
 				<icon>plugins/Morpheus/images/search.png</icon>
 				<iconSVG>plugins/Morpheus/images/search.svg</iconSVG>
 				<title>Site Search</title>
-				<subtitle>ecommerce</subtitle>
+				<subtitle>ecommerce - Search Category: web - Search Results Count: 205</subtitle>
 				
-				<customVariables>
-					<row>
-						<customVariablePageName4>Search Category</customVariablePageName4>
-						<customVariablePageValue4>web</customVariablePageValue4>
-					</row>
-					<row>
-						<customVariablePageName5>Search Results Count</customVariablePageName5>
-						<customVariablePageValue5>205</customVariablePageValue5>
-					</row>
-				</customVariables>
 				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
@@ -31896,24 +31784,16 @@
 				<pageId>757</pageId>
 				<bandwidth />
 				<siteSearchKeyword>ecommerce</siteSearchKeyword>
+				<siteSearchCategory>web</siteSearchCategory>
+				<siteSearchCount>205</siteSearchCount>
 				<generationTimeMilliseconds>585</generationTimeMilliseconds>
 				<generationTime>0.59s</generationTime>
 				<interactionPosition>3</interactionPosition>
 				<icon>plugins/Morpheus/images/search.png</icon>
 				<iconSVG>plugins/Morpheus/images/search.svg</iconSVG>
 				<title>Site Search</title>
-				<subtitle>ecommerce</subtitle>
+				<subtitle>ecommerce - Search Category: web - Search Results Count: 205</subtitle>
 				
-				<customVariables>
-					<row>
-						<customVariablePageName4>Search Category</customVariablePageName4>
-						<customVariablePageValue4>web</customVariablePageValue4>
-					</row>
-					<row>
-						<customVariablePageName5>Search Results Count</customVariablePageName5>
-						<customVariablePageValue5>205</customVariablePageValue5>
-					</row>
-				</customVariables>
 				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
@@ -36648,24 +36528,16 @@
 				<pageId>4</pageId>
 				<bandwidth />
 				<siteSearchKeyword>mobile</siteSearchKeyword>
+				<siteSearchCategory>images</siteSearchCategory>
+				<siteSearchCount>200</siteSearchCount>
 				<generationTimeMilliseconds>545</generationTimeMilliseconds>
 				<generationTime>0.55s</generationTime>
 				<interactionPosition>4</interactionPosition>
 				<icon>plugins/Morpheus/images/search.png</icon>
 				<iconSVG>plugins/Morpheus/images/search.svg</iconSVG>
 				<title>Site Search</title>
-				<subtitle>mobile</subtitle>
+				<subtitle>mobile - Search Category: images - Search Results Count: 200</subtitle>
 				
-				<customVariables>
-					<row>
-						<customVariablePageName4>Search Category</customVariablePageName4>
-						<customVariablePageValue4>images</customVariablePageValue4>
-					</row>
-					<row>
-						<customVariablePageName5>Search Results Count</customVariablePageName5>
-						<customVariablePageValue5>200</customVariablePageValue5>
-					</row>
-				</customVariables>
 				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
@@ -38829,20 +38701,16 @@
 				<timeSpent>0</timeSpent>
 				<timeSpentPretty>0s</timeSpentPretty>
 				<siteSearchKeyword>analytics</siteSearchKeyword>
+				<siteSearchCategory />
+				<siteSearchCount>210</siteSearchCount>
 				<generationTimeMilliseconds>1030</generationTimeMilliseconds>
 				<generationTime>1.03s</generationTime>
 				<interactionPosition>2</interactionPosition>
 				<icon>plugins/Morpheus/images/search.png</icon>
 				<iconSVG>plugins/Morpheus/images/search.svg</iconSVG>
 				<title>Site Search</title>
-				<subtitle>analytics</subtitle>
+				<subtitle>analytics - Search Results Count: 210</subtitle>
 				
-				<customVariables>
-					<row>
-						<customVariablePageName5>Search Results Count</customVariablePageName5>
-						<customVariablePageValue5>210</customVariablePageValue5>
-					</row>
-				</customVariables>
 				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 			<row>
@@ -40210,24 +40078,16 @@
 				<pageId>61</pageId>
 				<bandwidth />
 				<siteSearchKeyword>ecommerce</siteSearchKeyword>
+				<siteSearchCategory>web</siteSearchCategory>
+				<siteSearchCount>205</siteSearchCount>
 				<generationTimeMilliseconds>585</generationTimeMilliseconds>
 				<generationTime>0.59s</generationTime>
 				<interactionPosition>3</interactionPosition>
 				<icon>plugins/Morpheus/images/search.png</icon>
 				<iconSVG>plugins/Morpheus/images/search.svg</iconSVG>
 				<title>Site Search</title>
-				<subtitle>ecommerce</subtitle>
+				<subtitle>ecommerce - Search Category: web - Search Results Count: 205</subtitle>
 				
-				<customVariables>
-					<row>
-						<customVariablePageName4>Search Category</customVariablePageName4>
-						<customVariablePageValue4>web</customVariablePageValue4>
-					</row>
-					<row>
-						<customVariablePageName5>Search Results Count</customVariablePageName5>
-						<customVariablePageValue5>205</customVariablePageValue5>
-					</row>
-				</customVariables>
 				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>