diff --git a/api/HTMLMediaElement.json b/api/HTMLMediaElement.json
index 134dfe6f2cfe60..13cdb9c5064cf3 100644
--- a/api/HTMLMediaElement.json
+++ b/api/HTMLMediaElement.json
@@ -3186,6 +3186,9 @@
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/textTracks",
           "spec_url": "https://html.spec.whatwg.org/multipage/media.html#dom-media-texttracks-dev",
+          "tags": [
+            "web-features:text-tracks"
+          ],
           "support": {
             "chrome": {
               "version_added": "23"
diff --git a/api/MediaError.json b/api/MediaError.json
index 1caa127dccd202..eb254c051d551e 100644
--- a/api/MediaError.json
+++ b/api/MediaError.json
@@ -4,6 +4,9 @@
       "__compat": {
         "mdn_url": "https://developer.mozilla.org/docs/Web/API/MediaError",
         "spec_url": "https://html.spec.whatwg.org/multipage/media.html#error-codes",
+        "tags": [
+          "web-features:video"
+        ],
         "support": {
           "chrome": {
             "version_added": "3"
@@ -51,6 +54,9 @@
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/MediaError/code",
           "spec_url": "https://html.spec.whatwg.org/multipage/media.html#dom-mediaerror-code-dev",
+          "tags": [
+            "web-features:video"
+          ],
           "support": {
             "chrome": {
               "version_added": "3"
@@ -92,6 +98,9 @@
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/MediaError/message",
           "spec_url": "https://html.spec.whatwg.org/multipage/media.html#dom-mediaerror-message-dev",
+          "tags": [
+            "web-features:video"
+          ],
           "support": {
             "chrome": {
               "version_added": "59"
diff --git a/api/ServiceWorkerGlobalScope.json b/api/ServiceWorkerGlobalScope.json
index b06f72f9396c4d..240b30ccbd7567 100644
--- a/api/ServiceWorkerGlobalScope.json
+++ b/api/ServiceWorkerGlobalScope.json
@@ -656,7 +656,7 @@
             "https://w3c.github.io/ServiceWorker/#dom-serviceworkerglobalscope-onmessageerror"
           ],
           "tags": [
-            "web-features:service-workers"
+            "web-features:messageerror"
           ],
           "support": {
             "chrome": {
diff --git a/api/TimeRanges.json b/api/TimeRanges.json
index e42362e985bb91..1bbf3b36a6e5f9 100644
--- a/api/TimeRanges.json
+++ b/api/TimeRanges.json
@@ -4,6 +4,9 @@
       "__compat": {
         "mdn_url": "https://developer.mozilla.org/docs/Web/API/TimeRanges",
         "spec_url": "https://html.spec.whatwg.org/multipage/media.html#time-ranges",
+        "tags": [
+          "web-features:video"
+        ],
         "support": {
           "chrome": {
             "version_added": "6"
@@ -44,6 +47,9 @@
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/TimeRanges/end",
           "spec_url": "https://html.spec.whatwg.org/multipage/media.html#dom-timeranges-end-dev",
+          "tags": [
+            "web-features:video"
+          ],
           "support": {
             "chrome": {
               "version_added": "6"
@@ -85,6 +91,9 @@
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/TimeRanges/length",
           "spec_url": "https://html.spec.whatwg.org/multipage/media.html#dom-timeranges-length-dev",
+          "tags": [
+            "web-features:video"
+          ],
           "support": {
             "chrome": {
               "version_added": "6"
@@ -126,6 +135,9 @@
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/TimeRanges/start",
           "spec_url": "https://html.spec.whatwg.org/multipage/media.html#dom-timeranges-start-dev",
+          "tags": [
+            "web-features:video"
+          ],
           "support": {
             "chrome": {
               "version_added": "6"