From 3468334cc884835114225a8708e9d8b144900539 Mon Sep 17 00:00:00 2001
From: jellizaveta <e.egorova@adguard.com>
Date: Fri, 27 Oct 2023 14:38:52 +0300
Subject: [PATCH 01/16] fix yume,_inc name

---
 dist/trackers.json      | 4 ++--
 dist/whotracksme.json   | 4 ++--
 source/whotracksme.json | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dist/trackers.json b/dist/trackers.json
index 0d553782..2fda8386 100644
--- a/dist/trackers.json
+++ b/dist/trackers.json
@@ -19877,7 +19877,7 @@
             "url": "http://www.yume.com/",
             "companyId": "yume"
         },
-        "yume,_inc.": {
+        "yume_inc": {
             "name": "YuMe, Inc.",
             "categoryId": 4,
             "url": "http://www.yume.com/",
@@ -25052,7 +25052,7 @@
         "prod-js.aws.y-track.com": "ysance",
         "y-track.com": "ysance",
         "yume.com": "yume",
-        "yumenetworks.com": "yume,_inc.",
+        "yumenetworks.com": "yume_inc",
         "gravityrd-services.com": "yusp",
         "api.zadarma.com": "zadarma",
         "zalan.do": "zalando_de",
diff --git a/dist/whotracksme.json b/dist/whotracksme.json
index a5ab13c0..e90f5178 100644
--- a/dist/whotracksme.json
+++ b/dist/whotracksme.json
@@ -19015,7 +19015,7 @@
             "url": "http://www.yume.com/",
             "companyId": "yume"
         },
-        "yume,_inc.": {
+        "yume_inc": {
             "name": "YuMe, Inc.",
             "categoryId": 4,
             "url": "http://www.yume.com/",
@@ -23481,7 +23481,7 @@
         "prod-js.aws.y-track.com": "ysance",
         "y-track.com": "ysance",
         "yume.com": "yume",
-        "yumenetworks.com": "yume,_inc.",
+        "yumenetworks.com": "yume_inc",
         "gravityrd-services.com": "yusp",
         "api.zadarma.com": "zadarma",
         "zalan.do": "zalando_de",
diff --git a/source/whotracksme.json b/source/whotracksme.json
index 5f6efaff..9cc52808 100644
--- a/source/whotracksme.json
+++ b/source/whotracksme.json
@@ -19015,7 +19015,7 @@
             "url": "http://www.yume.com/",
             "companyId": "yume"
         },
-        "yume,_inc.": {
+        "yume_inc": {
             "name": "YuMe, Inc.",
             "categoryId": 4,
             "url": "http://www.yume.com/",
@@ -23481,7 +23481,7 @@
         "prod-js.aws.y-track.com": "ysance",
         "y-track.com": "ysance",
         "yume.com": "yume",
-        "yumenetworks.com": "yume,_inc.",
+        "yumenetworks.com": "yume_inc",
         "gravityrd-services.com": "yusp",
         "api.zadarma.com": "zadarma",
         "zalan.do": "zalando_de",

From a93164fd7d5e4d41c86e93b512bb8513b2bc7dff Mon Sep 17 00:00:00 2001
From: jellizaveta <e.egorova@adguard.com>
Date: Fri, 27 Oct 2023 16:10:52 +0300
Subject: [PATCH 02/16] added escaping

---
 dist/trackers.json      |  4 ++--
 dist/whotracksme.json   |  4 ++--
 index.ts                | 14 +++++++++++++-
 source/whotracksme.json |  4 ++--
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/dist/trackers.json b/dist/trackers.json
index 2fda8386..0d553782 100644
--- a/dist/trackers.json
+++ b/dist/trackers.json
@@ -19877,7 +19877,7 @@
             "url": "http://www.yume.com/",
             "companyId": "yume"
         },
-        "yume_inc": {
+        "yume,_inc.": {
             "name": "YuMe, Inc.",
             "categoryId": 4,
             "url": "http://www.yume.com/",
@@ -25052,7 +25052,7 @@
         "prod-js.aws.y-track.com": "ysance",
         "y-track.com": "ysance",
         "yume.com": "yume",
-        "yumenetworks.com": "yume_inc",
+        "yumenetworks.com": "yume,_inc.",
         "gravityrd-services.com": "yusp",
         "api.zadarma.com": "zadarma",
         "zalan.do": "zalando_de",
diff --git a/dist/whotracksme.json b/dist/whotracksme.json
index e90f5178..a5ab13c0 100644
--- a/dist/whotracksme.json
+++ b/dist/whotracksme.json
@@ -19015,7 +19015,7 @@
             "url": "http://www.yume.com/",
             "companyId": "yume"
         },
-        "yume_inc": {
+        "yume,_inc.": {
             "name": "YuMe, Inc.",
             "categoryId": 4,
             "url": "http://www.yume.com/",
@@ -23481,7 +23481,7 @@
         "prod-js.aws.y-track.com": "ysance",
         "y-track.com": "ysance",
         "yume.com": "yume",
-        "yumenetworks.com": "yume_inc",
+        "yumenetworks.com": "yume,_inc.",
         "gravityrd-services.com": "yusp",
         "api.zadarma.com": "zadarma",
         "zalan.do": "zalando_de",
diff --git a/index.ts b/index.ts
index 5cbb12f1..b7d018df 100644
--- a/index.ts
+++ b/index.ts
@@ -270,6 +270,18 @@ function buildTrackersDomains(
     return sortRecordsAlphabetically(merged, false);
 }
 
+/**
+ * Escape special characters in a string for CSV format.
+ * @param {string} value - The input string to escape.
+ * @returns {string} - The escaped string.
+ */
+function escapeCSV(value: string): string {
+    if (value.includes(',') || value.includes('"')) {
+        return `"${value}"`;
+    }
+    return value;
+}
+
 /**
  * Builds the trackers CSV file in the following form:
  * domain;tracker_id;category_id
@@ -298,7 +310,7 @@ function buildTrackersCSV(
 
         const { categoryId } = tracker;
         if (typeof categoryId !== 'undefined') {
-            csv += `${domain};${trackerId};${categoryId}\n`;
+            csv += `${escapeCSV(domain)};${escapeCSV(trackerId)};${categoryId}\n`;
         } else {
             consola.warn(`Tracker ${trackerId} has no category ID, consider adding it`);
         }
diff --git a/source/whotracksme.json b/source/whotracksme.json
index 9cc52808..5f6efaff 100644
--- a/source/whotracksme.json
+++ b/source/whotracksme.json
@@ -19015,7 +19015,7 @@
             "url": "http://www.yume.com/",
             "companyId": "yume"
         },
-        "yume_inc": {
+        "yume,_inc.": {
             "name": "YuMe, Inc.",
             "categoryId": 4,
             "url": "http://www.yume.com/",
@@ -23481,7 +23481,7 @@
         "prod-js.aws.y-track.com": "ysance",
         "y-track.com": "ysance",
         "yume.com": "yume",
-        "yumenetworks.com": "yume_inc",
+        "yumenetworks.com": "yume,_inc.",
         "gravityrd-services.com": "yusp",
         "api.zadarma.com": "zadarma",
         "zalan.do": "zalando_de",

From 7085831c8cd67c634b69c24a6f1c91ee426ce9a1 Mon Sep 17 00:00:00 2001
From: jellizaveta <e.egorova@adguard.com>
Date: Fri, 27 Oct 2023 18:04:36 +0300
Subject: [PATCH 03/16] add csv-stringify

---
 index.ts     | 23 +++++++----------------
 package.json |  1 +
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/index.ts b/index.ts
index b7d018df..1be0a6ce 100644
--- a/index.ts
+++ b/index.ts
@@ -1,6 +1,7 @@
 import * as fs from 'fs';
 import * as zod from 'zod';
 import { consola } from 'consola';
+import { stringify } from 'csv-stringify/sync';
 
 const WHOTRACKSME_INPUT_PATH = 'source/whotracksme.json';
 const WHOTRACKSME_COMPANIES_INPUT_PATH = 'source/whotracksme_companies.json';
@@ -270,18 +271,6 @@ function buildTrackersDomains(
     return sortRecordsAlphabetically(merged, false);
 }
 
-/**
- * Escape special characters in a string for CSV format.
- * @param {string} value - The input string to escape.
- * @returns {string} - The escaped string.
- */
-function escapeCSV(value: string): string {
-    if (value.includes(',') || value.includes('"')) {
-        return `"${value}"`;
-    }
-    return value;
-}
-
 /**
  * Builds the trackers CSV file in the following form:
  * domain;tracker_id;category_id
@@ -303,16 +292,18 @@ function buildTrackersCSV(
 
     Object.entries(trackersDomains).forEach(([domain, trackerId]) => {
         const tracker = trackers[trackerId];
-
         if (!tracker) {
             throw new Error(`Tracker domain ${domain} has an invalid tracker ID: ${trackerId}`);
         }
-
         const { categoryId } = tracker;
         if (typeof categoryId !== 'undefined') {
-            csv += `${escapeCSV(domain)};${escapeCSV(trackerId)};${categoryId}\n`;
+            const csvRow = stringify([[domain, trackerId, categoryId]], {
+                delimiter: ';',
+                quoted_match: ',',
+            });
+            csv += csvRow;
         } else {
-            consola.warn(`Tracker ${trackerId} has no category ID, consider adding it`);
+            console.warn(`Tracker ${trackerId} has no category ID; consider adding it`);
         }
     });
 
diff --git a/package.json b/package.json
index 85d19897..f1c395f9 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     },
     "dependencies": {
         "consola": "^3.1.0",
+        "csv-stringify": "^6.4.4",
         "zod": "^3.21.4"
     }
 }

From 37cdc06f0cb1a34da951186dd50351c58de811ea Mon Sep 17 00:00:00 2001
From: jellizaveta <e.egorova@adguard.com>
Date: Fri, 27 Oct 2023 18:05:53 +0300
Subject: [PATCH 04/16] dist

---
 dist/companies.json   |  8 +++++++-
 dist/trackers.csv     | 10 ++++++++--
 dist/trackers.json    | 31 ++++++++++++++++++++++++++-----
 dist/whotracksme.json |  2 +-
 4 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/dist/companies.json b/dist/companies.json
index f6f02ebe..aa7865ce 100644
--- a/dist/companies.json
+++ b/dist/companies.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-10-19T12:57:04.527Z",
+    "timeUpdated": "2023-10-27T15:04:55.305Z",
     "companies": {
         "163": {
             "name": "163",
@@ -1568,6 +1568,12 @@
             "websiteUrl": "http://apester.com/",
             "description": null
         },
+        "apollo_global_management": {
+            "name": "Apollo Global Management, Inc.",
+            "websiteUrl": "https://www.apollo.com/",
+            "description": "Apollo Global Management, Inc. is an American private equity firm. It provides investment management and invests in credit, private equity, and real assets.",
+            "source": "AdGuard"
+        },
         "appdynamics": {
             "name": "AppDynamics",
             "websiteUrl": "http://www.appdynamics.com",
diff --git a/dist/trackers.csv b/dist/trackers.csv
index 79add301..5500b7c6 100644
--- a/dist/trackers.csv
+++ b/dist/trackers.csv
@@ -4892,10 +4892,15 @@ tumblr.com;yahoo;6
 yahoo.com;yahoo;6
 yahooapis.com;yahoo;6
 yimg.com;yahoo;6
-ads.yahoo.com;yahoo_ad_exchange;4
+oath.cloud;yahoo;6
+yahoo.net;yahoo;6
+yahooinc.com;yahoo;6
+yahoodns.net;yahoo;6
 yads.yahoo.com;yahoo_ad_exchange;4
 yieldmanager.com;yahoo_ad_exchange;4
 pr-bh.ybp.yahoo.com;yahoo_ad_manager;4
+ads.yahoo.com;yahoo_advertising;4
+adtech.yahooinc.com;yahoo_advertising;4
 analytics.yahoo.com;yahoo_analytics;6
 np.lexity.com;yahoo_commerce_central;4
 storage-yahoo.jp;yahoo_japan_retargeting;4
@@ -4905,6 +4910,7 @@ yimg.jp;yahoo_japan_retargeting;4
 yjtag.jp;yahoo_japan_retargeting;4
 ov.yahoo.co.jp;yahoo_overture;4
 overture.com;yahoo_overture;4
+search.yahooinc.com;yahoo_search;4
 luminate.com;yahoo_small_business;4
 pixazza.com;yahoo_small_business;4
 awaps.yandex.ru;yandex;4
@@ -4984,7 +4990,7 @@ yellowpages.com;yp;4
 prod-js.aws.y-track.com;ysance;4
 y-track.com;ysance;4
 yume.com;yume;4
-yumenetworks.com;yume,_inc.;4
+yumenetworks.com;"yume,_inc.";4
 gravityrd-services.com;yusp;6
 api.zadarma.com;zadarma;2
 zalan.do;zalando_de;8
diff --git a/dist/trackers.json b/dist/trackers.json
index 0d553782..4ccc7e2a 100644
--- a/dist/trackers.json
+++ b/dist/trackers.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-10-19T12:57:04.527Z",
+    "timeUpdated": "2023-10-27T15:04:55.305Z",
     "categories": {
         "0": "audio_video_player",
         "1": "comments",
@@ -7330,7 +7330,7 @@
             "name": "Flurry",
             "categoryId": 101,
             "url": "http://www.flurry.com/",
-            "companyId": "verizon",
+            "companyId": "apollo_global_management",
             "source": "AdGuard"
         },
         "flxone": {
@@ -19553,8 +19553,9 @@
         "yahoo": {
             "name": "Yahoo!",
             "categoryId": 6,
-            "url": "https://yahoo.com",
-            "companyId": "verizon"
+            "url": "https://yahoo.com/",
+            "companyId": "apollo_global_management",
+            "source": "AdGuard"
         },
         "yahoo_ad_exchange": {
             "name": "Yahoo! Ad Exchange",
@@ -19568,6 +19569,13 @@
             "url": "https://developer.yahoo.com/analytics/",
             "companyId": "verizon"
         },
+        "yahoo_advertising": {
+            "name": "Yahoo! Advertising",
+            "categoryId": 4,
+            "url": "https://www.advertising.yahooinc.com/",
+            "companyId": "apollo_global_management",
+            "source": "AdGuard"
+        },
         "yahoo_analytics": {
             "name": "Yahoo! Analytics",
             "categoryId": 6,
@@ -19598,6 +19606,13 @@
             "url": "http://searchmarketing.yahoo.com",
             "companyId": "verizon"
         },
+        "yahoo_search": {
+            "name": "Yahoo! Search",
+            "categoryId": 4,
+            "url": "https://search.yahooinc.com/",
+            "companyId": "apollo_global_management",
+            "source": "AdGuard"
+        },
         "yahoo_small_business": {
             "name": "Yahoo! Small Business",
             "categoryId": 4,
@@ -24960,10 +24975,15 @@
         "yahoo.com": "yahoo",
         "yahooapis.com": "yahoo",
         "yimg.com": "yahoo",
-        "ads.yahoo.com": "yahoo_ad_exchange",
+        "oath.cloud": "yahoo",
+        "yahoo.net": "yahoo",
+        "yahooinc.com": "yahoo",
+        "yahoodns.net": "yahoo",
         "yads.yahoo.com": "yahoo_ad_exchange",
         "yieldmanager.com": "yahoo_ad_exchange",
         "pr-bh.ybp.yahoo.com": "yahoo_ad_manager",
+        "ads.yahoo.com": "yahoo_advertising",
+        "adtech.yahooinc.com": "yahoo_advertising",
         "analytics.yahoo.com": "yahoo_analytics",
         "np.lexity.com": "yahoo_commerce_central",
         "storage-yahoo.jp": "yahoo_japan_retargeting",
@@ -24973,6 +24993,7 @@
         "yjtag.jp": "yahoo_japan_retargeting",
         "ov.yahoo.co.jp": "yahoo_overture",
         "overture.com": "yahoo_overture",
+        "search.yahooinc.com": "yahoo_search",
         "luminate.com": "yahoo_small_business",
         "pixazza.com": "yahoo_small_business",
         "awaps.yandex.ru": "yandex",
diff --git a/dist/whotracksme.json b/dist/whotracksme.json
index a5ab13c0..4941e01e 100644
--- a/dist/whotracksme.json
+++ b/dist/whotracksme.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-10-19T12:57:04.527Z",
+    "timeUpdated": "2023-10-27T15:04:55.305Z",
     "categories": {
         "0": "audio_video_player",
         "1": "comments",

From 55aab9574346df747664376f0b06d586af6e37cb Mon Sep 17 00:00:00 2001
From: jellizaveta <e.egorova@adguard.com>
Date: Fri, 27 Oct 2023 18:07:11 +0300
Subject: [PATCH 05/16] fixed typo

---
 index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.ts b/index.ts
index 1be0a6ce..4a5f7ca5 100644
--- a/index.ts
+++ b/index.ts
@@ -303,7 +303,7 @@ function buildTrackersCSV(
             });
             csv += csvRow;
         } else {
-            console.warn(`Tracker ${trackerId} has no category ID; consider adding it`);
+            consola.warn(`Tracker ${trackerId} has no category ID, consider adding it`);
         }
     });
 

From 47e6c6f4a986448e01684f32166e7aa94f5ec266 Mon Sep 17 00:00:00 2001
From: GH action <devteam@adguard.com>
Date: Sun, 29 Oct 2023 00:09:29 +0000
Subject: [PATCH 06/16] Auto-update

---
 dist/companies.json   | 2 +-
 dist/trackers.json    | 2 +-
 dist/whotracksme.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dist/companies.json b/dist/companies.json
index ceb9681b..626f32ae 100644
--- a/dist/companies.json
+++ b/dist/companies.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-10-22T00:09:43.045Z",
+    "timeUpdated": "2023-10-29T00:09:29.031Z",
     "companies": {
         "163": {
             "name": "163",
diff --git a/dist/trackers.json b/dist/trackers.json
index efa9c2be..5568592c 100644
--- a/dist/trackers.json
+++ b/dist/trackers.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-10-22T00:09:43.045Z",
+    "timeUpdated": "2023-10-29T00:09:29.031Z",
     "categories": {
         "0": "audio_video_player",
         "1": "comments",
diff --git a/dist/whotracksme.json b/dist/whotracksme.json
index 0d23d402..386bc504 100644
--- a/dist/whotracksme.json
+++ b/dist/whotracksme.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-10-22T00:09:43.045Z",
+    "timeUpdated": "2023-10-29T00:09:29.031Z",
     "categories": {
         "0": "audio_video_player",
         "1": "comments",

From 05cbbb53f2aea688227a21bd7d10d014521a9208 Mon Sep 17 00:00:00 2001
From: kyjhoz-mikfip-goXci0
 <149243371+kyjhoz-mikfip-goXci0@users.noreply.github.com>
Date: Sun, 29 Oct 2023 13:38:53 +1000
Subject: [PATCH 07/16] add azure.net

---
 source/trackers.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/trackers.json b/source/trackers.json
index f80c34d8..ed5f16f1 100644
--- a/source/trackers.json
+++ b/source/trackers.json
@@ -1129,6 +1129,7 @@
         "jira.com": "atlassian.net",
         "ss-inf.net": "atlassian.net",
         "azure.com": "azure",
+        "azure.net": "azure",
         "azurefd.net": "azure",
         "trafficmanager.net": "azure",
         "blob.core.windows.net": "azure_blob_storage",

From 96d7e3507758f9270413527b3ce49953cdabb2b7 Mon Sep 17 00:00:00 2001
From: kyjhoz-mikfip-goXci0
 <149243371+kyjhoz-mikfip-goXci0@users.noreply.github.com>
Date: Sun, 29 Oct 2023 13:43:50 +1000
Subject: [PATCH 08/16] fix microsoft trading name

---
 source/companies.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/companies.json b/source/companies.json
index 2ac0058d..29abcbf2 100644
--- a/source/companies.json
+++ b/source/companies.json
@@ -197,7 +197,7 @@
             "description": "Meta builds technologies that help people connect, find communities and grow businesses."
         },
         "microsoft": {
-            "name": "Microsoft",
+            "name": "Microsoft Corporation",
             "websiteUrl": "https://www.microsoft.com/",
             "description": "Microsoft is an American multinational corporation that develops, manufactures, licenses, supports, and sells a range of software products and services."
         },

From 7c9094a1050ee47e99cdef7d0459c1c75b48cdaf Mon Sep 17 00:00:00 2001
From: kyjhoz-mikfip-goXci0
 <149243371+kyjhoz-mikfip-goXci0@users.noreply.github.com>
Date: Sun, 29 Oct 2023 14:52:30 +1000
Subject: [PATCH 09/16] add aiv-delivery.net

---
 source/trackers.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/trackers.json b/source/trackers.json
index f80c34d8..9332b78c 100644
--- a/source/trackers.json
+++ b/source/trackers.json
@@ -1088,6 +1088,7 @@
         "alipayobjects.com": "alipay.com",
         "a2z.com": "amazon",
         "aamazoncognito.com": "amazon",
+        "aiv-delivery.net": "amazon",
         "amazon-corp.com": "amazon",
         "amazon.com.au": "amazon",
         "amazon.com.mx": "amazon",

From b0c9cadb8c224cc65b3ff46479bcd2c59c58837e Mon Sep 17 00:00:00 2001
From: GH action <devteam@adguard.com>
Date: Mon, 30 Oct 2023 07:40:33 +0000
Subject: [PATCH 10/16] Auto-update

---
 dist/companies.json   | 2 +-
 dist/trackers.json    | 2 +-
 dist/whotracksme.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dist/companies.json b/dist/companies.json
index 626f32ae..5bd612e0 100644
--- a/dist/companies.json
+++ b/dist/companies.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-10-29T00:09:29.031Z",
+    "timeUpdated": "2023-10-30T07:40:33.475Z",
     "companies": {
         "163": {
             "name": "163",
diff --git a/dist/trackers.json b/dist/trackers.json
index 5568592c..bca46adf 100644
--- a/dist/trackers.json
+++ b/dist/trackers.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-10-29T00:09:29.031Z",
+    "timeUpdated": "2023-10-30T07:40:33.475Z",
     "categories": {
         "0": "audio_video_player",
         "1": "comments",
diff --git a/dist/whotracksme.json b/dist/whotracksme.json
index 386bc504..57a97c80 100644
--- a/dist/whotracksme.json
+++ b/dist/whotracksme.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-10-29T00:09:29.031Z",
+    "timeUpdated": "2023-10-30T07:40:33.475Z",
     "categories": {
         "0": "audio_video_player",
         "1": "comments",

From 1fcaa5198c50f0a8e0999dc5a4790031265b4709 Mon Sep 17 00:00:00 2001
From: GH action <devteam@adguard.com>
Date: Wed, 1 Nov 2023 00:09:28 +0000
Subject: [PATCH 11/16] Auto-update

---
 dist/companies.json   | 2 +-
 dist/trackers.json    | 2 +-
 dist/whotracksme.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dist/companies.json b/dist/companies.json
index 5bd612e0..a5bf2bb6 100644
--- a/dist/companies.json
+++ b/dist/companies.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-10-30T07:40:33.475Z",
+    "timeUpdated": "2023-11-01T00:09:27.826Z",
     "companies": {
         "163": {
             "name": "163",
diff --git a/dist/trackers.json b/dist/trackers.json
index bca46adf..5784cdf6 100644
--- a/dist/trackers.json
+++ b/dist/trackers.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-10-30T07:40:33.475Z",
+    "timeUpdated": "2023-11-01T00:09:27.826Z",
     "categories": {
         "0": "audio_video_player",
         "1": "comments",
diff --git a/dist/whotracksme.json b/dist/whotracksme.json
index 57a97c80..8ae98421 100644
--- a/dist/whotracksme.json
+++ b/dist/whotracksme.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-10-30T07:40:33.475Z",
+    "timeUpdated": "2023-11-01T00:09:27.826Z",
     "categories": {
         "0": "audio_video_player",
         "1": "comments",

From 9a872a70bc0c38d4253eba2dcb0d67f16bd44069 Mon Sep 17 00:00:00 2001
From: kyjhoz-mikfip-goXci0
 <149243371+kyjhoz-mikfip-goXci0@users.noreply.github.com>
Date: Wed, 1 Nov 2023 16:21:18 +0000
Subject: [PATCH 12/16] add to amazon_video instead

---
 source/trackers.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/trackers.json b/source/trackers.json
index 9332b78c..7bde88c9 100644
--- a/source/trackers.json
+++ b/source/trackers.json
@@ -1088,7 +1088,6 @@
         "alipayobjects.com": "alipay.com",
         "a2z.com": "amazon",
         "aamazoncognito.com": "amazon",
-        "aiv-delivery.net": "amazon",
         "amazon-corp.com": "amazon",
         "amazon.com.au": "amazon",
         "amazon.com.mx": "amazon",
@@ -1102,7 +1101,9 @@
         "amazontrust.com": "amazon_cdn",
         "associates-amazon.com": "amazon_cdn",
         "amazonpay.in": "amazon_payments",
+        "aiv-delivery.net": "amazon_video",
         "amazonvideo.com": "amazon_video",
+        "primevideo.com": "amazon_video",
         "appcenter.ms": "appcenter",
         "aaplimg.com": "apple",
         "apple-cloudkit.com": "apple",

From 0ab728ca9f46d0a32fd7049dbbda15a6481cff36 Mon Sep 17 00:00:00 2001
From: GH action <devteam@adguard.com>
Date: Wed, 8 Nov 2023 00:08:58 +0000
Subject: [PATCH 13/16] Auto-update

---
 dist/companies.json   | 2 +-
 dist/trackers.json    | 2 +-
 dist/whotracksme.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dist/companies.json b/dist/companies.json
index a5bf2bb6..ad4a4c53 100644
--- a/dist/companies.json
+++ b/dist/companies.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-11-01T00:09:27.826Z",
+    "timeUpdated": "2023-11-08T00:08:58.291Z",
     "companies": {
         "163": {
             "name": "163",
diff --git a/dist/trackers.json b/dist/trackers.json
index 5784cdf6..c731ef72 100644
--- a/dist/trackers.json
+++ b/dist/trackers.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-11-01T00:09:27.826Z",
+    "timeUpdated": "2023-11-08T00:08:58.291Z",
     "categories": {
         "0": "audio_video_player",
         "1": "comments",
diff --git a/dist/whotracksme.json b/dist/whotracksme.json
index 8ae98421..b84febde 100644
--- a/dist/whotracksme.json
+++ b/dist/whotracksme.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-11-01T00:09:27.826Z",
+    "timeUpdated": "2023-11-08T00:08:58.291Z",
     "categories": {
         "0": "audio_video_player",
         "1": "comments",

From 6fec3ef685244aef69ce27f71fb3ba93d382d265 Mon Sep 17 00:00:00 2001
From: GH action <devteam@adguard.com>
Date: Thu, 9 Nov 2023 13:32:14 +0000
Subject: [PATCH 14/16] Auto-update

---
 dist/companies.json   | 4 ++--
 dist/trackers.json    | 2 +-
 dist/whotracksme.json | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dist/companies.json b/dist/companies.json
index ad4a4c53..95815d40 100644
--- a/dist/companies.json
+++ b/dist/companies.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-11-08T00:08:58.291Z",
+    "timeUpdated": "2023-11-09T13:32:14.057Z",
     "companies": {
         "163": {
             "name": "163",
@@ -6805,7 +6805,7 @@
             "description": "MicroAd is a Japanese behavioral targeting ad delivery service. They offer contextual advertising services as well as retargeting and other ad delivery services."
         },
         "microsoft": {
-            "name": "Microsoft",
+            "name": "Microsoft Corporation",
             "websiteUrl": "https://www.microsoft.com/",
             "description": "Microsoft is an American multinational corporation that develops, manufactures, licenses, supports, and sells a range of software products and services.",
             "source": "AdGuard"
diff --git a/dist/trackers.json b/dist/trackers.json
index c731ef72..7bb6b8b9 100644
--- a/dist/trackers.json
+++ b/dist/trackers.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-11-08T00:08:58.291Z",
+    "timeUpdated": "2023-11-09T13:32:14.057Z",
     "categories": {
         "0": "audio_video_player",
         "1": "comments",
diff --git a/dist/whotracksme.json b/dist/whotracksme.json
index b84febde..326535c3 100644
--- a/dist/whotracksme.json
+++ b/dist/whotracksme.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-11-08T00:08:58.291Z",
+    "timeUpdated": "2023-11-09T13:32:14.057Z",
     "categories": {
         "0": "audio_video_player",
         "1": "comments",

From aba6a9cfd0e2c276e5bd010dcde9918309bbce12 Mon Sep 17 00:00:00 2001
From: GH action <devteam@adguard.com>
Date: Thu, 9 Nov 2023 13:38:42 +0000
Subject: [PATCH 15/16] Auto-update

---
 dist/companies.json   | 2 +-
 dist/trackers.csv     | 1 +
 dist/trackers.json    | 3 ++-
 dist/whotracksme.json | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dist/companies.json b/dist/companies.json
index 95815d40..5d21dab5 100644
--- a/dist/companies.json
+++ b/dist/companies.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-11-09T13:32:14.057Z",
+    "timeUpdated": "2023-11-09T13:38:42.079Z",
     "companies": {
         "163": {
             "name": "163",
diff --git a/dist/trackers.csv b/dist/trackers.csv
index 5500b7c6..5ea5145e 100644
--- a/dist/trackers.csv
+++ b/dist/trackers.csv
@@ -769,6 +769,7 @@ perfb.com;awin;4
 ad.globe7.com;axill;4
 azadify.com;azadify;4
 azure.com;azure;10
+azure.net;azure;10
 azurefd.net;azure;10
 trafficmanager.net;azure;10
 blob.core.windows.net;azure_blob_storage;8
diff --git a/dist/trackers.json b/dist/trackers.json
index 7bb6b8b9..525b2f74 100644
--- a/dist/trackers.json
+++ b/dist/trackers.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-11-09T13:32:14.057Z",
+    "timeUpdated": "2023-11-09T13:38:42.079Z",
     "categories": {
         "0": "audio_video_player",
         "1": "comments",
@@ -20852,6 +20852,7 @@
         "ad.globe7.com": "axill",
         "azadify.com": "azadify",
         "azure.com": "azure",
+        "azure.net": "azure",
         "azurefd.net": "azure",
         "trafficmanager.net": "azure",
         "blob.core.windows.net": "azure_blob_storage",
diff --git a/dist/whotracksme.json b/dist/whotracksme.json
index 326535c3..e069a071 100644
--- a/dist/whotracksme.json
+++ b/dist/whotracksme.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-11-09T13:32:14.057Z",
+    "timeUpdated": "2023-11-09T13:38:42.079Z",
     "categories": {
         "0": "audio_video_player",
         "1": "comments",

From 09a5c768ac855f4244dfcf3e1ab547bfcf8ccca4 Mon Sep 17 00:00:00 2001
From: GH action <devteam@adguard.com>
Date: Thu, 9 Nov 2023 13:44:47 +0000
Subject: [PATCH 16/16] Auto-update

---
 dist/companies.json   | 2 +-
 dist/trackers.csv     | 2 ++
 dist/trackers.json    | 4 +++-
 dist/whotracksme.json | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/dist/companies.json b/dist/companies.json
index 5d21dab5..608402d0 100644
--- a/dist/companies.json
+++ b/dist/companies.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-11-09T13:38:42.079Z",
+    "timeUpdated": "2023-11-09T13:44:47.025Z",
     "companies": {
         "163": {
             "name": "163",
diff --git a/dist/trackers.csv b/dist/trackers.csv
index 5ea5145e..0d45085e 100644
--- a/dist/trackers.csv
+++ b/dist/trackers.csv
@@ -622,7 +622,9 @@ amazonpay.com;amazon_payments;2
 payments-amazon.com;amazon_payments;2
 amazonpay.in;amazon_payments;2
 aiv-cdn.net;amazon_video;0
+aiv-delivery.net;amazon_video;0
 amazonvideo.com;amazon_video;0
+primevideo.com;amazon_video;0
 amazonaws.com;amazon_web_services;10
 amazonwebservices.com;amazon_web_services;10
 awsstatic.com;amazon_web_services;10
diff --git a/dist/trackers.json b/dist/trackers.json
index 525b2f74..b66be51b 100644
--- a/dist/trackers.json
+++ b/dist/trackers.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-11-09T13:38:42.079Z",
+    "timeUpdated": "2023-11-09T13:44:47.025Z",
     "categories": {
         "0": "audio_video_player",
         "1": "comments",
@@ -20705,7 +20705,9 @@
         "payments-amazon.com": "amazon_payments",
         "amazonpay.in": "amazon_payments",
         "aiv-cdn.net": "amazon_video",
+        "aiv-delivery.net": "amazon_video",
         "amazonvideo.com": "amazon_video",
+        "primevideo.com": "amazon_video",
         "amazonaws.com": "amazon_web_services",
         "amazonwebservices.com": "amazon_web_services",
         "awsstatic.com": "amazon_web_services",
diff --git a/dist/whotracksme.json b/dist/whotracksme.json
index e069a071..4a6e2ec8 100644
--- a/dist/whotracksme.json
+++ b/dist/whotracksme.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-11-09T13:38:42.079Z",
+    "timeUpdated": "2023-11-09T13:44:47.025Z",
     "categories": {
         "0": "audio_video_player",
         "1": "comments",