From 2b7e1cf22c67dea1f93b0c67bf37167a9fbd1c3a Mon Sep 17 00:00:00 2001
From: Alex-302 <alex302@adguard.com>
Date: Thu, 14 May 2026 21:04:26 +0300
Subject: [PATCH] Fix #216755 Even more tracking parameters submission

---
 SpywareFilter/sections/cookies_general.txt |  2 ++
 TrackParamFilter/sections/general_url.txt  |  9 ++++++
 TrackParamFilter/sections/specific.txt     | 33 +++++++++++++++++-----
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/SpywareFilter/sections/cookies_general.txt b/SpywareFilter/sections/cookies_general.txt
index d9697bbba5c..28d72e525e9 100644
--- a/SpywareFilter/sections/cookies_general.txt
+++ b/SpywareFilter/sections/cookies_general.txt
@@ -6,6 +6,8 @@
 ! Bad:  ||example.com^$cookie=flat_r_mb (should be in cookies_specific.txt)
 !
 !
+! Rakuten
+$cookie=rmStoreGateway
 ! Comscore
 $cookie=cs_fpid
 ! Contentinsights
diff --git a/TrackParamFilter/sections/general_url.txt b/TrackParamFilter/sections/general_url.txt
index 3ccf41d1603..c3d3efd8e94 100644
--- a/TrackParamFilter/sections/general_url.txt
+++ b/TrackParamFilter/sections/general_url.txt
@@ -9,6 +9,15 @@
 !
 ! NOTE: Generic rules
 !
+! Not identified. Used on avira.com, malwarebytes.com and some other sites
+! https://urlscan.io/search/#page.url%3A%22x-clickref%3D%22
+$removeparam=x-clickref
+$removeparam=x-source
+$removeparam=x-a-medium
+! Rakuten
+$removeparam=ranMID
+$removeparam=ranEAID
+$removeparam=ranSiteID
 ! Not identified, popular in emails
 $removeparam=eml-name
 $removeparam=eml-mediaplan
diff --git a/TrackParamFilter/sections/specific.txt b/TrackParamFilter/sections/specific.txt
index 733414764a9..48e8f582602 100644
--- a/TrackParamFilter/sections/specific.txt
+++ b/TrackParamFilter/sections/specific.txt
@@ -6,6 +6,27 @@
 ! Bad: ||example.org^$xmlhttprequest,redirect=noopvast-3.0 (for instance, should be in specific.txt)
 !
 !
+! bestbuy.com
+||bestbuycreators.7tiv.net^$removeparam=sharedid
+||bestbuycreators.7tiv.net^$removeparam=adcampaignid
+||bestbuycreators.7tiv.net^$removeparam=svlink
+||bestbuycreators.7tiv.net^$removeparam=subId1
+||bestbuycreators.7tiv.net^$removeparam=subId2
+||bestbuycreators.7tiv.net^$removeparam=subId3
+||bestbuy.7tiv.net^$removeparam=subid1
+||bestbuy.7tiv.net^$removeparam=subid2
+||bestbuy.7tiv.net^$removeparam=subid3
+||www.bestbuy.com^$removeparam=id
+||www.bestbuy.com^$removeparam=mpid
+||www.bestbuy.com^$removeparam=acampid
+! artlist.io
+||artlist.io^$removeparam=artlist_aid
+! newegg.com
+||newegg.com^$removeparam=AFFID
+||newegg.com^$removeparam=AFFNAME
+||newegg.com^$removeparam=ACRID
+||newegg.com^$removeparam=ASUBID
+||newegg.com^$removeparam=ASID
 ! taboolanews.com
 ||taboolanews.com^$removeparam=dc_data
 ! https://github.com/AdguardTeam/AdguardFilters/issues/231019
@@ -1203,10 +1224,6 @@ $removeparam=from,domain=doujinnomori.com|shinshi-manga.net|echiman.com|dojin-na
 ||smartrecruiters.com^$removeparam=km_adgroup
 ||smartrecruiters.com^$removeparam=km_matchtype
 ||smartrecruiters.com^$removeparam=km_partner
-! https://github.com/AdguardTeam/AdguardFilters/issues/171822
-||nuuvem.com^$removeparam=ranMID
-||nuuvem.com^$removeparam=ranEAID
-||nuuvem.com^$removeparam=ranSiteID
 ! https://github.com/AdguardTeam/AdguardFilters/issues/171802
 ||gog.com^$removeparam=pp
 ! https://github.com/AdguardTeam/AdguardFilters/issues/171289
@@ -1607,9 +1624,6 @@ mailchimp.com$removeparam=amp%3Bafl
 ||productcatalog.channeladvisor.com^$document,removeparam=profileId
 ||go.skimresources.com^$document,removeparam=id
 ||go.skimresources.com^$document,removeparam=xcust
-||chemistwarehouse.com.au^$removeparam=ranMID
-||chemistwarehouse.com.au^$removeparam=ranEAID
-||chemistwarehouse.com.au^$removeparam=ranSiteID
 ! https://github.com/AdguardTeam/AdguardFilters/issues/153536
 ||playstation.com$removeparam=emcid
 ! epicgames.com
@@ -2749,6 +2763,11 @@ $removeparam=asc_campaign,domain=aboutamazon.com|amazon.*|amzn.to
 $removeparam=asc_refurl,domain=aboutamazon.com|amazon.*|amzn.to
 $removeparam=asc_source,domain=aboutamazon.com|amazon.*|amzn.to
 !
+||amazon.*&linkCode=*&tag=*&linkId=$removeparam=crid
+||amazon.*&linkCode=*&tag=*&linkId=$removeparam=sprefix
+||amazon.*&linkCode=*&tag=*&linkId=$removeparam=linkCode
+||amazon.*&linkCode=*&tag=*&linkId=$removeparam=tag
+||amazon.*&linkCode=*&tag=*&linkId=$removeparam=linkId
 ||amazon.*$removeparam=ascsubtag
 ||amazon.*$removeparam=isDramIntegrated
 ||amazon.*$removeparam=shoppingPortalEnabled