diff --git a/api/MediaKeyMessageEvent.json b/api/MediaKeyMessageEvent.json
index bb6addde486455..d5f0a1dee319b0 100644
--- a/api/MediaKeyMessageEvent.json
+++ b/api/MediaKeyMessageEvent.json
@@ -39,7 +39,7 @@
         "__compat": {
           "description": "<code>MediaKeyMessageEvent()</code> constructor",
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/MediaKeyMessageEvent/MediaKeyMessageEvent",
-          "spec_url": "https://w3c.github.io/encrypted-media/#constructors",
+          "spec_url": "https://w3c.github.io/encrypted-media/#dom-mediakeymessageevent-constructor",
           "support": {
             "chrome": {
               "version_added": "42"
diff --git a/api/MimeType.json b/api/MimeType.json
index 9d5a37a14ba588..9b8a5464ebdc8e 100644
--- a/api/MimeType.json
+++ b/api/MimeType.json
@@ -3,7 +3,7 @@
     "MimeType": {
       "__compat": {
         "mdn_url": "https://developer.mozilla.org/docs/Web/API/MimeType",
-        "spec_url": "https://html.spec.whatwg.org/multipage/obsolete.html#mimetype",
+        "spec_url": "https://html.spec.whatwg.org/multipage/system-state.html#mimetype",
         "support": {
           "chrome": {
             "version_added": "1"
diff --git a/api/MimeTypeArray.json b/api/MimeTypeArray.json
index d69dcb61bdef0e..8d2b9c06cb1d9b 100644
--- a/api/MimeTypeArray.json
+++ b/api/MimeTypeArray.json
@@ -3,7 +3,7 @@
     "MimeTypeArray": {
       "__compat": {
         "mdn_url": "https://developer.mozilla.org/docs/Web/API/MimeTypeArray",
-        "spec_url": "https://html.spec.whatwg.org/multipage/obsolete.html#mimetypearray",
+        "spec_url": "https://html.spec.whatwg.org/multipage/system-state.html#mimetypearray",
         "support": {
           "chrome": {
             "version_added": "1"
diff --git a/api/Navigator.json b/api/Navigator.json
index 7bd424d4302369..90b6bc64943a92 100644
--- a/api/Navigator.json
+++ b/api/Navigator.json
@@ -1675,7 +1675,7 @@
       "javaEnabled": {
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/Navigator/javaEnabled",
-          "spec_url": "https://html.spec.whatwg.org/multipage/obsolete.html#dom-navigator-javaenabled",
+          "spec_url": "https://html.spec.whatwg.org/multipage/system-state.html#dom-navigator-javaenabled",
           "support": {
             "chrome": {
               "version_added": "1"
@@ -2151,7 +2151,7 @@
       "mimeTypes": {
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/Navigator/mimeTypes",
-          "spec_url": "https://html.spec.whatwg.org/multipage/obsolete.html#dom-navigator-mimetypes",
+          "spec_url": "https://html.spec.whatwg.org/multipage/system-state.html#dom-navigator-mimetypes",
           "support": {
             "chrome": {
               "version_added": "1"
@@ -2494,7 +2494,7 @@
       "plugins": {
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/Navigator/plugins",
-          "spec_url": "https://html.spec.whatwg.org/multipage/obsolete.html#dom-navigator-plugins",
+          "spec_url": "https://html.spec.whatwg.org/multipage/system-state.html#dom-navigator-plugins",
           "support": {
             "chrome": {
               "version_added": "1"
diff --git a/api/PaymentInstruments.json b/api/PaymentInstruments.json
index 91ead89b7c0696..cc38f6242a4688 100644
--- a/api/PaymentInstruments.json
+++ b/api/PaymentInstruments.json
@@ -2,7 +2,6 @@
   "api": {
     "PaymentInstruments": {
       "__compat": {
-        "spec_url": "https://w3c.github.io/payment-handler/#paymentinstruments-interface",
         "support": {
           "chrome": {
             "version_added": "70",
@@ -31,14 +30,13 @@
         },
         "status": {
           "experimental": false,
-          "standard_track": true,
+          "standard_track": false,
           "deprecated": true
         }
       },
       "clear": {
         "__compat": {
           "description": "<code>clear()</code>",
-          "spec_url": "https://w3c.github.io/payment-handler/#dom-paymentinstruments-clear",
           "support": {
             "chrome": {
               "version_added": "70",
@@ -67,7 +65,7 @@
           },
           "status": {
             "experimental": false,
-            "standard_track": true,
+            "standard_track": false,
             "deprecated": true
           }
         }
@@ -75,7 +73,6 @@
       "delete": {
         "__compat": {
           "description": "<code>delete()</code>",
-          "spec_url": "https://w3c.github.io/payment-handler/#dom-paymentinstruments-delete",
           "support": {
             "chrome": {
               "version_added": "70",
@@ -104,7 +101,7 @@
           },
           "status": {
             "experimental": false,
-            "standard_track": true,
+            "standard_track": false,
             "deprecated": true
           }
         }
@@ -112,7 +109,6 @@
       "get": {
         "__compat": {
           "description": "<code>get()</code>",
-          "spec_url": "https://w3c.github.io/payment-handler/#dom-paymentinstruments-get",
           "support": {
             "chrome": {
               "version_added": "70",
@@ -141,7 +137,7 @@
           },
           "status": {
             "experimental": false,
-            "standard_track": true,
+            "standard_track": false,
             "deprecated": true
           }
         }
@@ -149,7 +145,6 @@
       "has": {
         "__compat": {
           "description": "<code>has()</code>",
-          "spec_url": "https://w3c.github.io/payment-handler/#dom-paymentinstruments-has",
           "support": {
             "chrome": {
               "version_added": "70",
@@ -178,7 +173,7 @@
           },
           "status": {
             "experimental": false,
-            "standard_track": true,
+            "standard_track": false,
             "deprecated": true
           }
         }
@@ -186,7 +181,6 @@
       "keys": {
         "__compat": {
           "description": "<code>keys()</code>",
-          "spec_url": "https://w3c.github.io/payment-handler/#dom-paymentinstruments-keys",
           "support": {
             "chrome": {
               "version_added": "70",
@@ -215,7 +209,7 @@
           },
           "status": {
             "experimental": false,
-            "standard_track": true,
+            "standard_track": false,
             "deprecated": true
           }
         }
@@ -223,7 +217,6 @@
       "set": {
         "__compat": {
           "description": "<code>set()</code>",
-          "spec_url": "https://w3c.github.io/payment-handler/#dom-paymentinstruments-set",
           "support": {
             "chrome": {
               "version_added": "70",
@@ -252,7 +245,7 @@
           },
           "status": {
             "experimental": false,
-            "standard_track": true,
+            "standard_track": false,
             "deprecated": true
           }
         }
diff --git a/api/Plugin.json b/api/Plugin.json
index 338497a244136d..d161fc600b0a81 100644
--- a/api/Plugin.json
+++ b/api/Plugin.json
@@ -3,7 +3,7 @@
     "Plugin": {
       "__compat": {
         "mdn_url": "https://developer.mozilla.org/docs/Web/API/Plugin",
-        "spec_url": "https://html.spec.whatwg.org/multipage/obsolete.html#dom-plugin",
+        "spec_url": "https://html.spec.whatwg.org/multipage/system-state.html#dom-plugin",
         "support": {
           "chrome": {
             "version_added": "1"
diff --git a/api/PluginArray.json b/api/PluginArray.json
index 11c619a15b67b8..a07c32cd1bd287 100644
--- a/api/PluginArray.json
+++ b/api/PluginArray.json
@@ -3,7 +3,7 @@
     "PluginArray": {
       "__compat": {
         "mdn_url": "https://developer.mozilla.org/docs/Web/API/PluginArray",
-        "spec_url": "https://html.spec.whatwg.org/multipage/obsolete.html#pluginarray",
+        "spec_url": "https://html.spec.whatwg.org/multipage/system-state.html#pluginarray",
         "support": {
           "chrome": {
             "version_added": "1"
diff --git a/api/RTCEncodedAudioFrame.json b/api/RTCEncodedAudioFrame.json
index 46b51f0566107d..40fec2cb9904db 100644
--- a/api/RTCEncodedAudioFrame.json
+++ b/api/RTCEncodedAudioFrame.json
@@ -3,7 +3,7 @@
     "RTCEncodedAudioFrame": {
       "__compat": {
         "mdn_url": "https://developer.mozilla.org/docs/Web/API/RTCEncodedAudioFrame",
-        "spec_url": "https://w3c.github.io/webrtc-encoded-transform/#ref-for-rtcencodedaudioframe%E2%91%A1",
+        "spec_url": "https://w3c.github.io/webrtc-encoded-transform/#rtcencodedaudioframe",
         "tags": [
           "web-features:webrtc-encoded-transform"
         ],
@@ -147,10 +147,6 @@
       "timestamp": {
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/RTCEncodedAudioFrame/timestamp",
-          "spec_url": "https://w3c.github.io/webrtc-encoded-transform/#dom-rtcencodedaudioframe-timestamp",
-          "tags": [
-            "web-features:webrtc-encoded-transform"
-          ],
           "support": {
             "chrome": {
               "version_added": "86"
@@ -176,8 +172,8 @@
           },
           "status": {
             "experimental": false,
-            "standard_track": true,
-            "deprecated": false
+            "standard_track": false,
+            "deprecated": true
           }
         }
       }
diff --git a/api/RTCEncodedVideoFrame.json b/api/RTCEncodedVideoFrame.json
index 4a4499f88f3b10..d003d2a493094e 100644
--- a/api/RTCEncodedVideoFrame.json
+++ b/api/RTCEncodedVideoFrame.json
@@ -147,10 +147,6 @@
       "timestamp": {
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/RTCEncodedVideoFrame/timestamp",
-          "spec_url": "https://w3c.github.io/webrtc-encoded-transform/#dom-rtcencodedvideoframe-timestamp",
-          "tags": [
-            "web-features:webrtc-encoded-transform"
-          ],
           "support": {
             "chrome": {
               "version_added": "86"
@@ -176,8 +172,8 @@
           },
           "status": {
             "experimental": false,
-            "standard_track": true,
-            "deprecated": false
+            "standard_track": false,
+            "deprecated": true
           }
         }
       },
diff --git a/api/RTCStatsReport.json b/api/RTCStatsReport.json
index d650d1968f36a9..adbc22f3764742 100644
--- a/api/RTCStatsReport.json
+++ b/api/RTCStatsReport.json
@@ -2919,7 +2919,7 @@
         "kind": {
           "__compat": {
             "description": "<code>kind</code> in 'inbound-rtp' stats",
-            "spec_url": "https://w3c.github.io/webrtc-stats/#dom-rtcinboundrtpstreamstats-kind",
+            "spec_url": "https://w3c.github.io/webrtc-stats/#dom-rtcrtpstreamstats-kind",
             "support": {
               "chrome": {
                 "version_added": "80"
diff --git a/api/Range.json b/api/Range.json
index 57ef63f030e6a5..feec56fed1ec6b 100644
--- a/api/Range.json
+++ b/api/Range.json
@@ -439,7 +439,7 @@
       "createContextualFragment": {
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/Range/createContextualFragment",
-          "spec_url": "https://w3c.github.io/DOM-Parsing/#ref-for-dom-range-createcontextualfragment-2",
+          "spec_url": "https://html.spec.whatwg.org/multipage/dynamic-markup-insertion.html#dom-range-createcontextualfragment",
           "support": {
             "chrome": {
               "version_added": "1"
diff --git a/api/Sanitizer.json b/api/Sanitizer.json
index 4c88664ad80d7e..64b2a70ec35a7f 100644
--- a/api/Sanitizer.json
+++ b/api/Sanitizer.json
@@ -86,7 +86,6 @@
       },
       "getConfiguration": {
         "__compat": {
-          "spec_url": "https://wicg.github.io/sanitizer-api/#dom-sanitizer-getconfiguration",
           "support": {
             "chrome": {
               "version_added": "105",
@@ -113,7 +112,7 @@
           },
           "status": {
             "experimental": false,
-            "standard_track": true,
+            "standard_track": false,
             "deprecated": true
           }
         }
@@ -121,7 +120,6 @@
       "getDefaultConfiguration_static": {
         "__compat": {
           "description": "<code>getDefaultConfiguration()</code> static method",
-          "spec_url": "https://wicg.github.io/sanitizer-api/#dom-sanitizer-getdefaultconfiguration",
           "support": {
             "chrome": {
               "version_added": "105",
@@ -148,7 +146,7 @@
           },
           "status": {
             "experimental": false,
-            "standard_track": true,
+            "standard_track": false,
             "deprecated": true
           }
         }
@@ -156,7 +154,6 @@
       "sanitize": {
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/Sanitizer/sanitize",
-          "spec_url": "https://wicg.github.io/sanitizer-api/#dom-sanitizer-sanitize",
           "support": {
             "chrome": {
               "version_added": false
@@ -189,7 +186,7 @@
           },
           "status": {
             "experimental": false,
-            "standard_track": true,
+            "standard_track": false,
             "deprecated": true
           }
         }
diff --git a/api/ToggleEvent.json b/api/ToggleEvent.json
index b290ee52f84502..01dfb1b11f582e 100644
--- a/api/ToggleEvent.json
+++ b/api/ToggleEvent.json
@@ -3,7 +3,7 @@
     "ToggleEvent": {
       "__compat": {
         "mdn_url": "https://developer.mozilla.org/docs/Web/API/ToggleEvent",
-        "spec_url": "https://html.spec.whatwg.org/multipage/popover.html#toggleevent",
+        "spec_url": "https://html.spec.whatwg.org/multipage/interaction.html#toggleevent",
         "tags": [
           "web-features:popover"
         ],
@@ -40,7 +40,7 @@
         "__compat": {
           "description": "<code>ToggleEvent()</code> constructor",
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/ToggleEvent/ToggleEvent",
-          "spec_url": "https://html.spec.whatwg.org/multipage/popover.html#toggleevent",
+          "spec_url": "https://html.spec.whatwg.org/multipage/interaction.html#toggleevent",
           "tags": [
             "web-features:popover"
           ],
@@ -77,7 +77,7 @@
       "newState": {
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/ToggleEvent/newState",
-          "spec_url": "https://html.spec.whatwg.org/multipage/popover.html#dom-toggleevent-newstate",
+          "spec_url": "https://html.spec.whatwg.org/multipage/interaction.html#dom-toggleevent-newstate",
           "tags": [
             "web-features:popover"
           ],
@@ -114,7 +114,7 @@
       "oldState": {
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/ToggleEvent/oldState",
-          "spec_url": "https://html.spec.whatwg.org/multipage/popover.html#dom-toggleevent-oldstate",
+          "spec_url": "https://html.spec.whatwg.org/multipage/interaction.html#dom-toggleevent-oldstate",
           "tags": [
             "web-features:popover"
           ],
diff --git a/api/VideoEncoder.json b/api/VideoEncoder.json
index adcedbe7c7303c..f96ddb3e634a01 100644
--- a/api/VideoEncoder.json
+++ b/api/VideoEncoder.json
@@ -164,7 +164,7 @@
         "__compat": {
           "description": "<code>dequeue</code> event",
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/VideoEncoder/dequeue_event",
-          "spec_url": "https://w3c.github.io/webcodecs/#eventdef-videencoder-dequeue",
+          "spec_url": "https://w3c.github.io/webcodecs/#dom-videodecoder-ondequeue",
           "tags": [
             "web-features:webcodecs"
           ],
diff --git a/api/XRCubeLayer.json b/api/XRCubeLayer.json
index fbe862fd96d176..baede72d25a6ae 100644
--- a/api/XRCubeLayer.json
+++ b/api/XRCubeLayer.json
@@ -75,7 +75,7 @@
         "__compat": {
           "description": "<code>redraw</code> event",
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/XRCubeLayer/redraw_event",
-          "spec_url": "https://immersive-web.github.io/layers/#eventdef-xrlayer-redraw",
+          "spec_url": "https://immersive-web.github.io/layers/#dom-xrcubelayer-onredraw",
           "support": {
             "chrome": {
               "version_added": false
diff --git a/api/XRCylinderLayer.json b/api/XRCylinderLayer.json
index 97896710853f33..7c2e5ffd1ed4f4 100644
--- a/api/XRCylinderLayer.json
+++ b/api/XRCylinderLayer.json
@@ -147,7 +147,7 @@
         "__compat": {
           "description": "<code>redraw</code> event",
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/XRCylinderLayer/redraw_event",
-          "spec_url": "https://immersive-web.github.io/layers/#eventdef-xrlayer-redraw",
+          "spec_url": "https://immersive-web.github.io/layers/#dom-xrcylinderlayer-onredraw",
           "support": {
             "chrome": {
               "version_added": false
diff --git a/api/XREquirectLayer.json b/api/XREquirectLayer.json
index 8bb2ab999a8be6..c1cf3498f8df91 100644
--- a/api/XREquirectLayer.json
+++ b/api/XREquirectLayer.json
@@ -147,7 +147,7 @@
         "__compat": {
           "description": "<code>redraw</code> event",
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/XREquirectLayer/redraw_event",
-          "spec_url": "https://immersive-web.github.io/layers/#eventdef-xrlayer-redraw",
+          "spec_url": "https://immersive-web.github.io/layers/#dom-xrequirectlayer-onredraw",
           "support": {
             "chrome": {
               "version_added": false
diff --git a/api/XRQuadLayer.json b/api/XRQuadLayer.json
index 3792269255c2d9..c84cbf5c2673d6 100644
--- a/api/XRQuadLayer.json
+++ b/api/XRQuadLayer.json
@@ -75,7 +75,7 @@
         "__compat": {
           "description": "<code>redraw</code> event",
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/XRQuadLayer/redraw_event",
-          "spec_url": "https://immersive-web.github.io/layers/#eventdef-xrlayer-redraw",
+          "spec_url": "https://immersive-web.github.io/layers/#dom-xrquadlayer-onredraw",
           "support": {
             "chrome": {
               "version_added": false