diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js
index 700b63bef..35b16e87f 100644
--- a/builds/appchan-x.user.js
+++ b/builds/appchan-x.user.js
@@ -412,7 +412,7 @@
       'Bottom Board List': true,
       'Custom Board Navigation': true
     },
-    boardnav: "[ toggle-all ]\na-replace\nc-replace\ng-replace\nk-replace\nv-replace\nvg-replace\nvr-replace\nck-replace\nco-replace\nfit-replace\njp-replace\nmu-replace\nsp-replace\ntv-replace\nvp-replace\n[external-text:\"FAQ\",\"\"]",
+    boardnav: "[ toggle-all ]\na-replace\nc-replace\ng-replace\nk-replace\nv-replace\nvg-replace\nvr-replace\nck-replace\nco-replace\nfit-replace\njp-replace\nmu-replace\nsp-replace\ntv-replace\nvp-replace\n[external-text:\"FAQ\",\"https://github.com/zixaphir/appchan-x/wiki/Frequently-Asked-Questions\"]",
     QR: {
       'QR.personas': "#options:\"sage\";boards:jp;always"
     },
@@ -503,7 +503,7 @@
     VERSION: '',
     NAMESPACE: 'appchan_x.',
     NAME: 'appchan x',
-    FAQ: '',
+    FAQ: 'https://github.com/zixaphir/appchan-x/wiki/Frequently-Asked-Questions',
     CHANGELOG: 'https://github.com/zixaphir/appchan-x/blob/master/CHANGELOG.md',
     boards: {}
   };
@@ -4562,7 +4562,7 @@
       }
       boardnav = boardnav.replace(/(\r\n|\n|\r)/g, ' ');
       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|index|catalog|archive|expired|(mode|sort|text|url):"[^"]+"(,"[^"]+")?))*|[^\w@]+/g;
       nodes = (function() {
         var _i, _len, _ref, _results;
         _ref = boardnav.match(re);
@@ -4581,7 +4581,8 @@
       if (/^[^\w@]/.test(t)) {
         return $.tn(t);
       }
-      text = url = null;
+      text = '';
+      url = '';
       t = t.replace(/-text:"([^"]+)"(?:,"([^"]+)")?/g, function(m0, m1, m2) {
         text = m1;
         url = m2;
diff --git a/builds/crx/script.js b/builds/crx/script.js
index c40b91b18..d4646dd05 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -384,7 +384,7 @@
       'Bottom Board List': true,
       'Custom Board Navigation': true
     },
-    boardnav: "[ toggle-all ]\na-replace\nc-replace\ng-replace\nk-replace\nv-replace\nvg-replace\nvr-replace\nck-replace\nco-replace\nfit-replace\njp-replace\nmu-replace\nsp-replace\ntv-replace\nvp-replace\n[external-text:\"FAQ\",\"\"]",
+    boardnav: "[ toggle-all ]\na-replace\nc-replace\ng-replace\nk-replace\nv-replace\nvg-replace\nvr-replace\nck-replace\nco-replace\nfit-replace\njp-replace\nmu-replace\nsp-replace\ntv-replace\nvp-replace\n[external-text:\"FAQ\",\"https://github.com/zixaphir/appchan-x/wiki/Frequently-Asked-Questions\"]",
     QR: {
       'QR.personas': "#options:\"sage\";boards:jp;always"
     },
@@ -475,7 +475,7 @@
     VERSION: '',
     NAMESPACE: 'appchan_x.',
     NAME: 'appchan x',
-    FAQ: '',
+    FAQ: 'https://github.com/zixaphir/appchan-x/wiki/Frequently-Asked-Questions',
     CHANGELOG: 'https://github.com/zixaphir/appchan-x/blob/master/CHANGELOG.md',
     boards: {}
   };
@@ -4580,7 +4580,7 @@
       }
       boardnav = boardnav.replace(/(\r\n|\n|\r)/g, ' ');
       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|index|catalog|archive|expired|(mode|sort|text|url):"[^"]+"(,"[^"]+")?))*|[^\w@]+/g;
       nodes = (function() {
         var _i, _len, _ref, _results;
         _ref = boardnav.match(re);
@@ -4599,7 +4599,8 @@
       if (/^[^\w@]/.test(t)) {
         return $.tn(t);
       }
-      text = url = null;
+      text = '';
+      url = '';
       t = t.replace(/-text:"([^"]+)"(?:,"([^"]+)")?/g, function(m0, m1, m2) {
         text = m1;
         url = m2;
diff --git a/package.json b/package.json
index 40cc01d4e..42db02870 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
     "namespace": "zixaphir",
     "repo": "https://github.com/zixaphir/appchan-x/",
     "page": "http://zixaphir.github.com/appchan-x/",
+    "faq":  "https://github.com/zixaphir/appchan-x/wiki/Frequently-Asked-Questions",
     "recaptchaKey": "6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc",
     "youtubeAPIKey": "AIzaSyCrvwsT3ub8sDl3S5APhok2eY-OzRcCK5U",
     "buildsPath": "builds/",
diff --git a/src/General/Header.coffee b/src/General/Header.coffee
index 38ab2bfa1..39cb49843 100644
--- a/src/General/Header.coffee
+++ b/src/General/Header.coffee
@@ -159,7 +159,7 @@ Header =
     return unless boardnav
     boardnav = boardnav.replace /(\r\n|\n|\r)/g, ' '
     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|index|catalog|archive|expired|(mode|sort|text|url):"[^"]+"(,"[^"]+")?))*|[^\w@]+/g
     nodes = (Header.mapCustomNavigation t, as for t in boardnav.match re)
     $.add list, nodes
     $.ready CatalogLinks.initBoardList
@@ -168,10 +168,11 @@ Header =
     if /^[^\w@]/.test t
       return $.tn t
 
-    text = url = null
+    text = '' 
+    url  = ''
     t = t.replace /-text:"([^"]+)"(?:,"([^"]+)")?/g, (m0, m1, m2) ->
       text = m1
-      url = m2
+      url  = m2
       ''
 
     if /^toggle-all/.test t