diff --git a/package.json b/package.json
index f998d553d..1fb93d26b 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,8 @@
   "dependencies": {
     "@prantlf/jsonlint": "^10.2.0",
     "adm-zip": "^0.4.14",
-    "convert-svg-to-png": "^0.5.0"
+    "convert-svg-to-png": "^0.5.0",
+    "languagedetect": "^2.0.0"
   },
   "devDependencies": {
     "@nuxtjs/eslint-config": "^1.0.1",
diff --git a/src/apps.json b/src/apps.json
index a27f3003b..15a0b9936 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -80,7 +80,10 @@
       "cats": [
         12
       ],
-      "html": "<html[^>]* (?:amp|⚡)[^-]",
+      "html": [
+        "<html[^>]* (?:amp|⚡)[^-]",
+        "<link rel=\"amphtml\""
+       ],
       "icon": "Accelerated-Mobile-Pages.svg",
       "website": "https://www.amp.dev"
     },
@@ -2469,6 +2472,14 @@
       "script": "conversionlab\\.trackset\\.com/track/tsend\\.js",
       "website": "http://www.trackset.it/conversionlab"
     },
+    "Cookiebot": {
+      "cats": [
+        67
+      ],
+      "script": "consent\\.cookiebot\\.com",    
+      "icon": "Cookiebot.svg",
+      "website": "http://www.cookiebot.com"
+    },      
     "Coppermine": {
       "cats": [
         7
@@ -2615,6 +2626,14 @@
       "icon": "CrossBox.png",
       "website": "https://crossbox.io"
     },
+    "Crownpeak": {
+      "cats": [
+        67
+      ],
+      "script": "c\\.evidon\\.com",    
+      "icon": "Crownpeak.png",
+      "website": "http://www.crownpeak.com"
+    },            
     "Crypto-Loot": {
       "cats": [
         56
@@ -4477,6 +4496,7 @@
     },
     "Google Analytics Enhanced eCommerce": {
       "cats": [
+        6,
         10
       ],
       "icon": "Google Analytics.svg",
@@ -7873,6 +7893,20 @@
       },
       "website": "http://www.onestat.com"
     },
+    "OneTrust": {
+      "cats": [
+        67
+      ],
+      "cookies": {
+        "OptanonConsent": ""
+      },
+      "script": [
+          "cdn\\.cookielaw\\.org", 
+          "optanon\\.blob\\.core\\.windows\\.net"
+      ],
+      "icon": "OneTrust.png",
+      "website": "http://www.onetrust.com"
+    },      
     "Onshop": {
       "cats": [
         6
@@ -9766,11 +9800,14 @@
     "Salesforce Commerce Cloud": {
       "cats": [
         6
-      ],
+      ],       
       "headers": {
         "Server": "Demandware eCommerce Server"
       },
-      "html": "<[^>]+demandware\\.edgesuite",
+      "html": [
+        "<[^>]+demandware\\.edgesuite",
+        "/demandware\\.static/"
+       ],
       "icon": "Salesforce.svg",
       "js": {
         "dwAnalytics": ""
@@ -10814,6 +10851,10 @@
         41
       ],
       "html": "<input[^>]+data-stripe",
+      "cookies": {
+        "__stripe_mid": "",
+        "__stripe_sid": ""
+      },
       "icon": "Stripe.png",
       "js": {
         "Stripe.version": "^(.+)$\\;version:\\1"
@@ -11478,6 +11519,14 @@
       "script": "tcdn\\.com\\.br",
       "website": "https://www.tray.com.br"
     },
+    "TrustArc": {
+      "cats": [
+        67
+      ],
+      "script": "consent\\.trustarc\\.com",    
+      "icon": "TrustArc.svg",
+      "website": "http://trustarc.com"
+    },      
     "Tumblr": {
       "cats": [
         11
@@ -14716,6 +14765,11 @@
     "66": {
       "name": "UI frameworks",
       "priority": 7
+    },
+    "67": {
+      "name": "Cookie compliance",
+      "priority": 9
     }
+      
   }
 }
diff --git a/src/drivers/npm/driver.js b/src/drivers/npm/driver.js
index 7b7fc079e..bce3bf326 100644
--- a/src/drivers/npm/driver.js
+++ b/src/drivers/npm/driver.js
@@ -137,7 +137,7 @@ class Driver {
   }
 
   open(url) {
-    return new Site(url, this)
+    return new Site(url.split('#')[0], this)
   }
 
   log(message, source = 'driver') {
diff --git a/src/drivers/webextension/_locales/ca/messages.json b/src/drivers/webextension/_locales/ca/messages.json
index 721464c9d..379a0caae 100644
--- a/src/drivers/webextension/_locales/ca/messages.json
+++ b/src/drivers/webextension/_locales/ca/messages.json
@@ -81,5 +81,6 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Proxys invers" },
 	"categoryName65":           { "message": "Balanceigs de càrrega" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" }
 }
diff --git a/src/drivers/webextension/_locales/de/messages.json b/src/drivers/webextension/_locales/de/messages.json
index 847dbf1fa..152ee10bb 100644
--- a/src/drivers/webextension/_locales/de/messages.json
+++ b/src/drivers/webextension/_locales/de/messages.json
@@ -81,5 +81,6 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" }
 }
diff --git a/src/drivers/webextension/_locales/el/messages.json b/src/drivers/webextension/_locales/el/messages.json
index 766f7f9b7..a9316d331 100644
--- a/src/drivers/webextension/_locales/el/messages.json
+++ b/src/drivers/webextension/_locales/el/messages.json
@@ -77,5 +77,6 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" }
 }
diff --git a/src/drivers/webextension/_locales/en/messages.json b/src/drivers/webextension/_locales/en/messages.json
index 9f7b85cc0..b7f5f48d4 100644
--- a/src/drivers/webextension/_locales/en/messages.json
+++ b/src/drivers/webextension/_locales/en/messages.json
@@ -79,5 +79,6 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse proxies" },
 	"categoryName65":           { "message": "Load balancers" },
-	"categoryName66":           { "message": "UI frameworks" }
+	"categoryName66":           { "message": "UI frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" }
 }
diff --git a/src/drivers/webextension/_locales/es/messages.json b/src/drivers/webextension/_locales/es/messages.json
index 14d102648..f30c9fdc5 100644
--- a/src/drivers/webextension/_locales/es/messages.json
+++ b/src/drivers/webextension/_locales/es/messages.json
@@ -81,5 +81,6 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" }
 }
diff --git a/src/drivers/webextension/_locales/fa/messages.json b/src/drivers/webextension/_locales/fa/messages.json
index adb30b530..3610858df 100644
--- a/src/drivers/webextension/_locales/fa/messages.json
+++ b/src/drivers/webextension/_locales/fa/messages.json
@@ -81,5 +81,6 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "پروکسی معکوس" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" }
 }
diff --git a/src/drivers/webextension/_locales/fr/messages.json b/src/drivers/webextension/_locales/fr/messages.json
index 37fd1c2ce..a291b9c42 100644
--- a/src/drivers/webextension/_locales/fr/messages.json
+++ b/src/drivers/webextension/_locales/fr/messages.json
@@ -81,5 +81,6 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" }
 }
diff --git a/src/drivers/webextension/_locales/gl_ES/messages.json b/src/drivers/webextension/_locales/gl_ES/messages.json
index 795060901..51ae4aafd 100644
--- a/src/drivers/webextension/_locales/gl_ES/messages.json
+++ b/src/drivers/webextension/_locales/gl_ES/messages.json
@@ -81,5 +81,6 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Proxy inverso" },
 	"categoryName65":           { "message": "Balanceador de carga" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" }
 }
diff --git a/src/drivers/webextension/_locales/gr/messages.json b/src/drivers/webextension/_locales/gr/messages.json
index b631044ee..787714b2e 100644
--- a/src/drivers/webextension/_locales/gr/messages.json
+++ b/src/drivers/webextension/_locales/gr/messages.json
@@ -77,5 +77,6 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" }
 }
diff --git a/src/drivers/webextension/_locales/id/messages.json b/src/drivers/webextension/_locales/id/messages.json
index 11d46d599..39737a2be 100644
--- a/src/drivers/webextension/_locales/id/messages.json
+++ b/src/drivers/webextension/_locales/id/messages.json
@@ -81,5 +81,6 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" }
 }
diff --git a/src/drivers/webextension/_locales/it/messages.json b/src/drivers/webextension/_locales/it/messages.json
index 27882408a..675d41ae3 100644
--- a/src/drivers/webextension/_locales/it/messages.json
+++ b/src/drivers/webextension/_locales/it/messages.json
@@ -81,5 +81,6 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" }
 }
diff --git a/src/drivers/webextension/_locales/ja/messages.json b/src/drivers/webextension/_locales/ja/messages.json
index 666d4d957..2b75819a2 100644
--- a/src/drivers/webextension/_locales/ja/messages.json
+++ b/src/drivers/webextension/_locales/ja/messages.json
@@ -81,5 +81,6 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "リバースプロキシ" },
 	"categoryName65":           { "message": "ロードバランサー" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" }
 }
diff --git a/src/drivers/webextension/_locales/pl/messages.json b/src/drivers/webextension/_locales/pl/messages.json
index 90e83acfd..04087bb63 100644
--- a/src/drivers/webextension/_locales/pl/messages.json
+++ b/src/drivers/webextension/_locales/pl/messages.json
@@ -81,5 +81,6 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Proxy wsteczne" },
 	"categoryName65":           { "message": "Równoważenie obciążenia" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" }
 }
diff --git a/src/drivers/webextension/_locales/pt/messages.json b/src/drivers/webextension/_locales/pt/messages.json
index a7fd7a55a..7d526e9a4 100644
--- a/src/drivers/webextension/_locales/pt/messages.json
+++ b/src/drivers/webextension/_locales/pt/messages.json
@@ -79,7 +79,8 @@
   "categoryName61":           { "message": "SaaS" },
   "categoryName62":           { "message": "PaaS" },
   "categoryName63":           { "message": "IaaS" },
-	"categoryName64":           { "message": "Reverse Proxy" },
-	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+  "categoryName64":           { "message": "Reverse Proxy" },
+  "categoryName65":           { "message": "Load Balancer" },
+  "categoryName66":           { "message": "UI Frameworks" },
+  "categoryName67":           { "message": "Cookie compliance" }
 }
diff --git a/src/drivers/webextension/_locales/pt_BR/messages.json b/src/drivers/webextension/_locales/pt_BR/messages.json
index e32b108aa..a4009e2b4 100644
--- a/src/drivers/webextension/_locales/pt_BR/messages.json
+++ b/src/drivers/webextension/_locales/pt_BR/messages.json
@@ -81,5 +81,6 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Proxy Reverso" },
 	"categoryName65":           { "message": "Balanceador de Carga" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" }
 }
diff --git a/src/drivers/webextension/_locales/ro/messages.json b/src/drivers/webextension/_locales/ro/messages.json
index a3036e74a..efb1d726d 100644
--- a/src/drivers/webextension/_locales/ro/messages.json
+++ b/src/drivers/webextension/_locales/ro/messages.json
@@ -77,5 +77,6 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" }
 }
diff --git a/src/drivers/webextension/_locales/ru/messages.json b/src/drivers/webextension/_locales/ru/messages.json
index 55d08dca6..68491ed16 100644
--- a/src/drivers/webextension/_locales/ru/messages.json
+++ b/src/drivers/webextension/_locales/ru/messages.json
@@ -79,5 +79,6 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Обратный прокси" },
 	"categoryName65":           { "message": "Балансировка нагрузки" },
-	"categoryName66":           { "message": "UI Фреймворк" }
+	"categoryName66":           { "message": "UI Фреймворк" },
+	"categoryName67":           { "message": "Cookie compliance" }
 }
diff --git a/src/drivers/webextension/_locales/sk/messages.json b/src/drivers/webextension/_locales/sk/messages.json
index b9ed2ce77..d5bd0c59e 100644
--- a/src/drivers/webextension/_locales/sk/messages.json
+++ b/src/drivers/webextension/_locales/sk/messages.json
@@ -81,5 +81,6 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" }
 }
diff --git a/src/drivers/webextension/_locales/tr/messages.json b/src/drivers/webextension/_locales/tr/messages.json
index 63167726a..133782272 100644
--- a/src/drivers/webextension/_locales/tr/messages.json
+++ b/src/drivers/webextension/_locales/tr/messages.json
@@ -81,5 +81,6 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Yük Dengeleyici" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" }
 }
diff --git a/src/drivers/webextension/_locales/uk/messages.json b/src/drivers/webextension/_locales/uk/messages.json
index c8c28983f..4b5cda5f2 100644
--- a/src/drivers/webextension/_locales/uk/messages.json
+++ b/src/drivers/webextension/_locales/uk/messages.json
@@ -81,5 +81,6 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" }
 }
diff --git a/src/drivers/webextension/_locales/uz/messages.json b/src/drivers/webextension/_locales/uz/messages.json
index b0af1ba9f..dc3982841 100644
--- a/src/drivers/webextension/_locales/uz/messages.json
+++ b/src/drivers/webextension/_locales/uz/messages.json
@@ -81,5 +81,6 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" }
 }
diff --git a/src/drivers/webextension/_locales/zh_CN/messages.json b/src/drivers/webextension/_locales/zh_CN/messages.json
index 2aadbda4c..39866faa3 100644
--- a/src/drivers/webextension/_locales/zh_CN/messages.json
+++ b/src/drivers/webextension/_locales/zh_CN/messages.json
@@ -81,5 +81,6 @@
 	"categoryName63":           { "message": "基础设施即服务（IaaS）" },
 	"categoryName64":           { "message": "反向代理" },
 	"categoryName65":           { "message": "负载均衡" },
-	"categoryName66":           { "message": "用户界面（UI）框架" }
+	"categoryName66":           { "message": "用户界面（UI）框架" },
+	"categoryName67":           { "message": "Cookie compliance" }
 }
diff --git a/src/drivers/webextension/_locales/zh_TW/messages.json b/src/drivers/webextension/_locales/zh_TW/messages.json
index 9ca2612f3..d24c8f257 100644
--- a/src/drivers/webextension/_locales/zh_TW/messages.json
+++ b/src/drivers/webextension/_locales/zh_TW/messages.json
@@ -81,5 +81,6 @@
   "categoryName63":           { "message": "基礎設施即服務（IaaS）" },
   "categoryName64":           { "message": "反向代理伺服器" },
   "categoryName65":           { "message": "負載平衡器" },
-  "categoryName66":           { "message": "UI 框架" }
+  "categoryName66":           { "message": "UI 框架" },
+  "categoryName67":           { "message": "Cookie compliance" }
 }
diff --git a/src/drivers/webextension/images/icons/Cookiebot.svg b/src/drivers/webextension/images/icons/Cookiebot.svg
new file mode 100644
index 000000000..c6acb47bd
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Cookiebot.svg
@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="8252 2133 134 27.328">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #39a8ef;
+      }
+    </style>
+  </defs>
+  <g id="Group_1203" data-name="Group 1203" transform="translate(8252 2133)">
+    <path id="Path_1743" data-name="Path 1743" class="cls-1" d="M67.236,21.834l-6.3-8.432,6.1-7.01H62.054L56.264,13.3V.5H52.2V21.834h4.064V17.872l1.829-1.93,4.064,5.892Z" transform="translate(0.831 0.008)"/>
+    <path id="Path_1744" data-name="Path 1744" class="cls-1" d="M69.738,4.876a2.472,2.472,0,0,0,2.438-2.438A2.472,2.472,0,0,0,69.738,0,2.407,2.407,0,0,0,67.3,2.438,2.407,2.407,0,0,0,69.738,4.876Z" transform="translate(1.071)"/>
+    <path id="Path_1745" data-name="Path 1745" class="cls-1" d="M71.562,21.942V6.5H67.6V21.942Z" transform="translate(1.076 0.103)"/>
+    <path id="Path_1746" data-name="Path 1746" class="cls-1" d="M94.164,21.834H90.1V.5h4.064V8.424a6.061,6.061,0,0,1,4.775-2.337c3.861,0,6.807,3.048,6.807,8.127,0,5.181-2.946,8.127-6.807,8.127a6.061,6.061,0,0,1-4.775-2.337Zm0-4.978a4.429,4.429,0,0,0,3.454,1.727c2.337,0,3.861-1.829,3.861-4.47s-1.524-4.47-3.861-4.47a4.525,4.525,0,0,0-3.454,1.829Zm35.049,5.588c-2.845,0-4.368-1.422-4.368-4.267V10.151H122.3V6.6h2.54V2.329h4.064V6.6h3.149v3.556h-3.149v7.01a1.536,1.536,0,0,0,1.422,1.727,2.368,2.368,0,0,0,1.422-.406l.813,3.048A5.749,5.749,0,0,1,129.213,22.444Z" transform="translate(1.435 0.008)"/>
+    <path id="Path_1747" data-name="Path 1747" class="cls-1" d="M84.993,20.635a7.842,7.842,0,0,1-11.175-2.946A7.824,7.824,0,0,1,76.663,6.716c3.962-2.235,8.331-.813,10.87,3.556l.406.813-9.854,5.689a4.14,4.14,0,0,0,5.588.914,6,6,0,0,0,2.743-3.353l2.845,1.422A9.3,9.3,0,0,1,84.993,20.635ZM83.266,10.577a3.572,3.572,0,0,0-4.978-1.118,3.73,3.73,0,0,0-1.524,4.876Z" transform="translate(1.157 0.09)"/>
+    <path id="Path_1748" data-name="Path 1748" class="cls-1" d="M23.061,4.868A13.236,13.236,0,0,0,0,13.91,13.311,13.311,0,0,0,13.309,27.32a13.506,13.506,0,0,0,9.854-4.368,11.424,11.424,0,0,1-3.657-2.946,8.275,8.275,0,0,1-6.1,2.641A8.534,8.534,0,1,1,19.4,8.018,9.936,9.936,0,0,1,23.061,4.868Z" transform="translate(0 0.008)"/>
+    <path id="Path_1749" data-name="Path 1749" class="cls-1" d="M27.026,21.955a8.128,8.128,0,1,1,8.026-8.127A8.065,8.065,0,0,1,27.026,21.955Zm0-3.861a4.267,4.267,0,1,0-4.267-4.267A4.293,4.293,0,0,0,27.026,18.094ZM43.89,21.955a8.128,8.128,0,1,1,8.026-8.127A8.065,8.065,0,0,1,43.89,21.955Zm0-3.861a4.267,4.267,0,1,0-4.267-4.267A4.293,4.293,0,0,0,43.89,18.094Z" transform="translate(0.303 0.091)"/>
+    <path id="Path_1750" data-name="Path 1750" class="cls-1" d="M114.326,21.955a8.128,8.128,0,1,1,8.026-8.127A8.065,8.065,0,0,1,114.326,21.955Zm.1-3.861a4.267,4.267,0,1,0-4.267-4.267A4.293,4.293,0,0,0,114.427,18.094Z" transform="translate(1.692 0.091)"/>
+  </g>
+</svg>
diff --git a/src/drivers/webextension/images/icons/Crownpeak.png b/src/drivers/webextension/images/icons/Crownpeak.png
new file mode 100644
index 000000000..4b80de9df
Binary files /dev/null and b/src/drivers/webextension/images/icons/Crownpeak.png differ
diff --git a/src/drivers/webextension/images/icons/OneTrust.png b/src/drivers/webextension/images/icons/OneTrust.png
new file mode 100644
index 000000000..da57f65e5
Binary files /dev/null and b/src/drivers/webextension/images/icons/OneTrust.png differ
diff --git a/src/drivers/webextension/images/icons/TrustArc.svg b/src/drivers/webextension/images/icons/TrustArc.svg
new file mode 100644
index 000000000..27f47cfca
--- /dev/null
+++ b/src/drivers/webextension/images/icons/TrustArc.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 300 100" style="enable-background:new 0 0 300 100;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#004676;}
+	.st2{fill:#5FC323;}
+</style>
+<rect x="-6.89" y="2.28" class="st0" width="314.63" height="132.85"/>
+<path class="st1" d="M80.95,46.68H67.66v-6.61h34.22v6.61H88.58v33.73h-7.63V46.68z M109.01,80.41V58.05
+	c1.29-0.74,3.19-1.17,5.46-1.17c1.53,0,3.01,0.18,4.42,0.55l1.84-6.02c-1.84-0.68-3.93-0.92-6.45-0.92
+	c-5.59,0-10.07,2.21-12.28,4.18v25.74H109.01z M145.36,51.5v22.44c-1.8,0.75-3.73,1.12-6.03,1.12c-5.9,0-7.15-2.67-7.15-7.46V51.5
+	h-7.08v18.15c0,7.15,4.1,11.69,13.3,11.69c6.52,0,11.06-1.68,14.05-3.11V51.5H145.36z M158.36,76.79c0,0,4.08,4.31,11.39,4.31
+	c6.96,0,11.21-3.91,11.21-8.8c0-9.44-14.26-8.92-14.26-13.07c0-1.84,1.84-2.65,3.74-2.65c4.49,0,7.19,2.53,7.19,2.53l2.7-5.41
+	c0,0-3.22-3.34-9.83-3.34c-6.33,0-11.22,3.17-11.22,8.63c0,9.44,14.27,8.86,14.27,13.24c0,1.73-1.78,2.65-3.85,2.65
+	c-4.77,0-7.99-3.22-7.99-3.22L158.36,76.79z M187.06,69.65c0,9.84,8.11,11.05,12.19,11.05c1.38,0,2.24-0.17,2.24-0.17v-6.39
+	c0,0-0.52,0.11-1.32,0.11c-2.01,0-5.81-0.69-5.81-5.52V57.76h6.67v-6.24h-6.67v-8.46h-7.13L187.06,69.65z M252.37,80.41V58.05
+	c1.29-0.74,3.19-1.17,5.47-1.17c1.53,0,3.01,0.18,4.42,0.55l1.84-6.02c-1.84-0.68-3.93-0.92-6.45-0.92
+	c-5.59,0-10.07,2.21-12.28,4.18v25.74H252.37z M280.52,50.89c-9.47,0-15.53,6.84-15.53,14.98c0,8.3,6.05,14.98,15.53,14.98
+	c7.68,0,11.77-4.66,11.77-4.66l-2.75-5.05c0,0-3.59,3.65-8.41,3.65c-5.44,0-8.91-4.15-8.91-8.98c0-4.88,3.42-8.86,8.69-8.86
+	c4.49,0,7.46,3.08,7.46,3.08l3.14-4.88C291.51,55.16,287.98,50.89,280.52,50.89 M230.1,69.94h-13.37l-3.6,10.24h-7.46l14.02-39.83
+	h7.45l14.01,39.83h-7.45L230.1,69.94z M228.03,64.04l-4.61-13.11l-4.61,13.11H228.03z"/>
+<g>
+	<g>
+		<path class="st2" d="M37.78,44.26c12.74-13.67,31.87-17.79,48.47-12.08c-12.2-7.71-28.19-8.42-41.39-0.48
+			C31.41,39.8,24.52,54.64,25.91,69.29C27.15,60.23,31.08,51.46,37.78,44.26"/>
+		<path class="st2" d="M19.81,14.08c3.68-0.13,6.74,1.67,6.85,3.97c0,0,0.45,2.28-3.4,5.45c-1.02,0.91-2.01,1.87-2.96,2.89
+			C3.83,44.06,4.8,71.76,22.47,88.24c0.06,0.06,0.13,0.11,0.19,0.17c-5.22-7.11-8.43-15.81-8.76-25.29
+			c-0.88-25.11,18.75-46.17,43.83-47.04c6.1-0.21,11.96,0.79,17.35,2.79c-9.93-6.08-21.69-7.8-32.64-5.27
+			c-2.84,0.42-5.71-0.4-6.8-0.76C30.64,10.88,24.81,11.19,19.81,14.08"/>
+	</g>
+</g>
+</svg>
diff --git a/src/drivers/webextension/js/content.js b/src/drivers/webextension/js/content.js
index 71dfbd994..3b031d84b 100644
--- a/src/drivers/webextension/js/content.js
+++ b/src/drivers/webextension/js/content.js
@@ -111,7 +111,7 @@ const Content = {
         chrome.runtime.sendMessage({
           source: 'content.js',
           func: 'analyzeJs',
-          args: [location.href, data.wappalyzer.js]
+          args: [location.href.split('#')[0], data.wappalyzer.js]
         })
 
         script.remove()
diff --git a/src/drivers/webextension/js/driver.js b/src/drivers/webextension/js/driver.js
index a79725e5a..1b1c02ff3 100644
--- a/src/drivers/webextension/js/driver.js
+++ b/src/drivers/webextension/js/driver.js
@@ -528,7 +528,7 @@ const Driver = {
           ]
 
           if (
-            !/((local|dev(elopment)?|stag(e|ing)?|test(ing)?|demo(shop)?|admin|google|cache)\.|\/admin|\.local|127\.)/.test(
+            !/((local|dev(elop(ment)?)?|stag(e|ing)?|preprod|test(ing)?|demo(shop)?|admin|cache)[.-]|localhost|google|\/admin|\.local|\.test|\.dev|127\.|0\.)/.test(
               hostname
             ) &&
             hits >= 3
diff --git a/yarn.lock b/yarn.lock
index f011f2b21..a83b36b5a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1242,6 +1242,11 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+languagedetect@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/languagedetect/-/languagedetect-2.0.0.tgz#4b8fa2b7593b2a3a02fb1100891041c53238936c"
+  integrity sha512-AZb/liiQ+6ZoTj4f1J0aE6OkzhCo8fyH+tuSaPfSo8YHCWLFJrdSixhtO2TYdIkjcDQNaR4RmGaV2A5FJklDMQ==
+
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"