diff --git a/src/js/codemirror/ubo-static-filtering.js b/src/js/codemirror/ubo-static-filtering.js
index aec5bb92f..79dc3618b 100644
--- a/src/js/codemirror/ubo-static-filtering.js
+++ b/src/js/codemirror/ubo-static-filtering.js
@@ -232,21 +232,12 @@ CodeMirror.defineMode('ubo-static-filtering', function() {
             parserSlot += 3;
             return 'def';
         }
-        const to = parser.skipUntil(
+        parserSlot = parser.skipUntil(
             parserSlot,
             parser.commentSpan.i,
             parser.BITComma | parser.BITEqual
         );
-        if (
-            to > parserSlot &&
-            /^[13]P/.test(parser.strFromSlices(parserSlot, to - 3))
-        ) {
-            parserSlot = to;
-            stream.pos = parser.slices[to+1];
-            return 'def notice';
-        }
-        parserSlot = to;
-        stream.pos = parser.slices[to+1];
+        stream.pos = parser.slices[parserSlot+1];
         return 'def';
     };
 
diff --git a/src/js/static-filtering-parser.js b/src/js/static-filtering-parser.js
index feead031a..24c41c5d1 100644
--- a/src/js/static-filtering-parser.js
+++ b/src/js/static-filtering-parser.js
@@ -2054,10 +2054,10 @@ Parser.prototype.OPTNotSupported = OPTNotSupported;
 const netOptionTokenDescriptors = new Map([
     [ '1p', OPTToken1p | OPTCanNegate ],
         [ 'first-party', OPTToken1p | OPTCanNegate ],
-    [ '1P', OPTToken1pStrict ],
+    [ 'strict1p', OPTToken1pStrict ],
     [ '3p', OPTToken3p | OPTCanNegate ],
         [ 'third-party', OPTToken3p | OPTCanNegate ],
-    [ '3P', OPTToken3pStrict ],
+    [ 'strict3p', OPTToken3pStrict ],
     [ 'all', OPTTokenAll | OPTNetworkType | OPTNonCspableType ],
     [ 'badfilter', OPTTokenBadfilter ],
     [ 'cname', OPTTokenCname | OPTAllowOnly | OPTModifierType ],
@@ -2109,10 +2109,10 @@ Parser.prototype.netOptionTokenDescriptors =
 Parser.netOptionTokenIds = new Map([
     [ '1p', OPTToken1p ],
         [ 'first-party', OPTToken1p ],
-    [ '1P', OPTToken1pStrict ],
+    [ 'strict1p', OPTToken1pStrict ],
     [ '3p', OPTToken3p ],
         [ 'third-party', OPTToken3p ],
-    [ '3P', OPTToken3pStrict ],
+    [ 'strict3p', OPTToken3pStrict ],
     [ 'all', OPTTokenAll ],
     [ 'badfilter', OPTTokenBadfilter ],
     [ 'cname', OPTTokenCname ],
@@ -2160,9 +2160,9 @@ Parser.netOptionTokenIds = new Map([
 
 Parser.netOptionTokenNames = new Map([
     [ OPTToken1p, '1p' ],
-    [ OPTToken1pStrict, '1P' ],
+    [ OPTToken1pStrict, 'strict1p' ],
     [ OPTToken3p, '3p' ],
-    [ OPTToken3pStrict, '3P' ],
+    [ OPTToken3pStrict, 'strict3p' ],
     [ OPTTokenAll, 'all' ],
     [ OPTTokenBadfilter, 'badfilter' ],
     [ OPTTokenCname, 'cname' ],