diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 00e6ed514..0f3f2232d 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -2141,7 +2141,7 @@
         return;
       }
       as = $$('#full-board-list a[title]', Header.boardList);
-      re = /[\w@]+(-(all|title|replace|full|archive|(mode|sort|text|url):"[^"]+"))*|[^\w@]+/g;
+      re = /[\w@]+(-(all|title|replace|full|archive|(mode|sort|text|url):"[^"]+"(\,"[^"]+[^"]")?))*|[^\w@]+/g;
       nodes = text.match(re).map(function(t) {
         var a, board, boardID, href, m, type, _i, _len;
         if (/^[^\w@]/.test(t)) {
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 7be0a29da..f2c456e3a 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -2200,7 +2200,7 @@
         return;
       }
       as = $$('#full-board-list a[title]', Header.boardList);
-      re = /[\w@]+(-(all|title|replace|full|archive|(mode|sort|text|url):"[^"]+"))*|[^\w@]+/g;
+      re = /[\w@]+(-(all|title|replace|full|archive|(mode|sort|text|url):"[^"]+"(\,"[^"]+[^"]")?))*|[^\w@]+/g;
       nodes = text.match(re).map(function(t) {
         var a, board, boardID, href, m, type, _i, _len;
         if (/^[^\w@]/.test(t)) {
diff --git a/src/General/Header.coffee b/src/General/Header.coffee
index 843d7891d..7b6440e33 100755
--- a/src/General/Header.coffee
+++ b/src/General/Header.coffee
@@ -168,7 +168,7 @@ Header =
     $.rmAll list
     return unless text
     as = $$ '#full-board-list a[title]', Header.boardList
-    re = /[\w@]+(-(all|title|replace|full|archive|(mode|sort|text|url):"[^"]+"))*|[^\w@]+/g
+    re = /[\w@]+(-(all|title|replace|full|archive|(mode|sort|text|url):"[^"]+"(\,"[^"]+[^"]")?))*|[^\w@]+/g
     nodes = text.match(re).map (t) ->
       if /^[^\w@]/.test t
         return $.tn t