From 897f223a4544ef7fe429abfbf1a81d8d2ede3b70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20G=C3=BCnther?= <stephan.guenther@mapp.com>
Date: Fri, 3 Jul 2026 12:00:50 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20client=20hints=20URL=20par?=
 =?UTF-8?q?ameter=20construction=20in=20mapp=5Fintelligence?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Consolidate separate param-name and value variables into single segment
variables that include the & separator only when the value is present,
preventing malformed &= fragments in the tracking URL when client hints
are disabled.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../0.1/test/vendor-requests.json             | 31 +++++++++----------
 .../0.1/vendors/mapp_intelligence.json        | 11 +++----
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/extensions/amp-analytics/0.1/test/vendor-requests.json b/extensions/amp-analytics/0.1/test/vendor-requests.json
index cfa52addac3e..1f810045c8a4 100644
--- a/extensions/amp-analytics/0.1/test/vendor-requests.json
+++ b/extensions/amp-analytics/0.1/test/vendor-requests.json
@@ -252,24 +252,21 @@
     "basePrefix": "?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,",
     "baseSuffix": ",_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_",
     "parameterPrefix": "?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,_timestamp_,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_",
-    "parameterSuffix": "&pu=_source_url_&_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)=_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)=_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)=_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1",
-    "uachModelValue": "_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)",
-    "uachPlatformValue": "_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)",
-    "uachPlatformVersionValue": "_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)",
-    "uachModelParam": "_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)",
-    "uachPlatformParam": "_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)",
-    "uachPlatformVersionParam": "_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)",
-    "clientHintParams": "&_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)=_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)=_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)=_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)",
-    "pageview": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,_timestamp_,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&&cp570=_page_load_time_&pu=_source_url_&_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)=_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)=_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)=_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1",
-    "event": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,_timestamp_,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&ct=webtrekk_ignore&&pu=_source_url_&_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)=_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)=_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)=_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1",
-    "scroll": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,_timestamp_,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&ct=webtrekk_ignore&ck540=!verticalScrollBoundary&pu=_source_url_&_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)=_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)=_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)=_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1",
+    "uachModelSegment": "_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-MODEL=\"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)",
+    "uachPlatformSegment": "_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM=\"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)",
+    "uachPlatformVersionSegment": "_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM-VERSION=\"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)",
+    "clientHintParams": "_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-MODEL=\"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM=\"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM-VERSION=\"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)",
+    "parameterSuffix": "&pu=_source_url__if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-MODEL=\"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM=\"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM-VERSION=\"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1",
+    "pageview": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,_timestamp_,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&&cp570=_page_load_time_&pu=_source_url__if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-MODEL=\"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM=\"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM-VERSION=\"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1",
+    "event": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,_timestamp_,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&ct=webtrekk_ignore&&pu=_source_url__if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-MODEL=\"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM=\"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM-VERSION=\"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1",
+    "scroll": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,_timestamp_,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&ct=webtrekk_ignore&ck540=!verticalScrollBoundary&pu=_source_url__if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-MODEL=\"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM=\"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM-VERSION=\"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1",
     "mediaPrefix": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&mi=!id",
-    "mediaSuffix": "&mt1=!currentTime&mt2=!duration&&pu=_source_url_&_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)=_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)=_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)=_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1&x=!playedTotal",
-    "mediaPlay": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&mi=!id&mk=play&mt1=!currentTime&mt2=!duration&&pu=_source_url_&_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)=_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)=_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)=_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1&x=!playedTotal",
-    "mediaPause": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&mi=!id&mk=pause&mt1=!currentTime&mt2=!duration&&pu=_source_url_&_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)=_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)=_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)=_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1&x=!playedTotal",
-    "mediaPosition": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&mi=!id&mk=pos&mt1=!currentTime&mt2=!duration&&pu=_source_url_&_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)=_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)=_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)=_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1&x=!playedTotal",
-    "mediaEnded": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&mi=!id&mk=eof&mt1=!currentTime&mt2=!duration&&pu=_source_url_&_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)=_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)=_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)=_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1&x=!playedTotal",
-    "mediaCustomEvent": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&mi=!id&mk=customMediaEvent&mt1=!currentTime&mt2=!duration&&pu=_source_url_&_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), X-WT-SEC-CH-UA-MODEL, !emptyValue)=_if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM, !emptyValue)=_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)&_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), X-WT-SEC-CH-UA-PLATFORM-VERSION, !emptyValue)=_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), \"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1&x=!playedTotal"
+    "mediaSuffix": "&mt1=!currentTime&mt2=!duration&&pu=_source_url__if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-MODEL=\"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM=\"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM-VERSION=\"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1&x=!playedTotal",
+    "mediaPlay": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&mi=!id&mk=play&mt1=!currentTime&mt2=!duration&&pu=_source_url__if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-MODEL=\"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM=\"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM-VERSION=\"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1&x=!playedTotal",
+    "mediaPause": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&mi=!id&mk=pause&mt1=!currentTime&mt2=!duration&&pu=_source_url__if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-MODEL=\"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM=\"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM-VERSION=\"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1&x=!playedTotal",
+    "mediaPosition": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&mi=!id&mk=pos&mt1=!currentTime&mt2=!duration&&pu=_source_url__if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-MODEL=\"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM=\"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM-VERSION=\"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1&x=!playedTotal",
+    "mediaEnded": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&mi=!id&mk=eof&mt1=!currentTime&mt2=!duration&&pu=_source_url__if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-MODEL=\"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM=\"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM-VERSION=\"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1&x=!playedTotal",
+    "mediaCustomEvent": "https://!trackDomain/!trackId/wt?p=440,_title_,1,_screen_width_x_screen_height_,_screen_color_depth_,1,,_document_referrer_,_viewport_width_x_viewport_height_,0&tz=_timezone_&eid=_client_id(amp-wt3-eid)_&la=_browser_language_&mi=!id&mk=customMediaEvent&mt1=!currentTime&mt2=!duration&&pu=_source_url__if(_if(!clientHints%252C_uach(model)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-MODEL=\"_if(!clientHints%2C_uach(model)__%2C%20!emptyValue)\", !emptyValue)_if(_if(!clientHints%252C_uach(platform)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM=\"_if(!clientHints%2C_uach(platform)__%2C%20!emptyValue)\", !emptyValue)_if(_if(!clientHints%252C_uach(platformVersion)___%2C%20!emptyValue), &X-WT-SEC-CH-UA-PLATFORM-VERSION=\"_if(!clientHints%2C_uach(platformVersion)__%2C%20!emptyValue)\", !emptyValue)&eor=1&x=!playedTotal"
   },
   "marinsoftware": {
     "base": "https://tracker.marinsm.com/tp",
diff --git a/extensions/amp-analytics/0.1/vendors/mapp_intelligence.json b/extensions/amp-analytics/0.1/vendors/mapp_intelligence.json
index cdf1bf6111ab..552dceee90d6 100644
--- a/extensions/amp-analytics/0.1/vendors/mapp_intelligence.json
+++ b/extensions/amp-analytics/0.1/vendors/mapp_intelligence.json
@@ -17,13 +17,10 @@
     "baseSuffix": ",${documentReferrer},${viewportWidth}x${viewportHeight},0&tz=${timezone}&eid=${everId}&la=${browserLanguage}",
     "parameterPrefix": "${basePrefix}${timestamp}${baseSuffix}",
     "parameterSuffix": "&pu=${sourceUrl}${clientHintParams}&eor=1",
-    "uachModelValue": "$IF(${uachModel}, \"${uachModel}\", ${emptyValue})",
-    "uachPlatformValue": "$IF(${uachPlatform}, \"${uachPlatform}\", ${emptyValue})",
-    "uachPlatformVersionValue": "$IF(${uachPlatformVersion}, \"${uachPlatformVersion}\", ${emptyValue})",
-    "uachModelParam": "$IF(${uachModel}, X-WT-SEC-CH-UA-MODEL, ${emptyValue})",
-    "uachPlatformParam": "$IF(${uachPlatform}, X-WT-SEC-CH-UA-PLATFORM, ${emptyValue})",
-    "uachPlatformVersionParam": "$IF(${uachPlatformVersion}, X-WT-SEC-CH-UA-PLATFORM-VERSION, ${emptyValue})",
-    "clientHintParams": "&${uachModelParam}=${uachModelValue}&${uachPlatformParam}=${uachPlatformValue}&${uachPlatformVersionParam}=${uachPlatformVersionValue}",
+    "uachModelSegment": "$IF(${uachModel}, &X-WT-SEC-CH-UA-MODEL=\"${uachModel}\", ${emptyValue})",
+    "uachPlatformSegment": "$IF(${uachPlatform}, &X-WT-SEC-CH-UA-PLATFORM=\"${uachPlatform}\", ${emptyValue})",
+    "uachPlatformVersionSegment": "$IF(${uachPlatformVersion}, &X-WT-SEC-CH-UA-PLATFORM-VERSION=\"${uachPlatformVersion}\", ${emptyValue})",
+    "clientHintParams": "${uachModelSegment}${uachPlatformSegment}${uachPlatformVersionSegment}",
     "pageview": "${trackURL}${parameterPrefix}&${extraUrlParams}&cp570=${pageLoadTime}${parameterSuffix}",
     "event": "${trackURL}${parameterPrefix}&ct=${actionName}&${extraUrlParams}${parameterSuffix}",
     "scroll": "${trackURL}${parameterPrefix}&ct=${actionName}&ck540=${verticalScrollBoundary}${parameterSuffix}",