diff --git a/LICENSE b/LICENSE
index 74956c9ca..955483dd7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 /*
-* appchan x - Version 2.9.5 - 2014-03-15
+* appchan x - Version 2.9.5 - 2014-03-19
 *
 * Licensed under the MIT license.
 * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js
index 371f260f6..33e6721bc 100644
--- a/builds/appchan-x.user.js
+++ b/builds/appchan-x.user.js
@@ -25,7 +25,7 @@
 // ==/UserScript==
 
 /*
-* appchan x - Version 2.9.5 - 2014-03-15
+* appchan x - Version 2.9.5 - 2014-03-19
 *
 * Licensed under the MIT license.
 * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@@ -16508,7 +16508,9 @@
             }
           }
         }
-        e.preventDefault();
+        if (e != null) {
+          e.preventDefault();
+        }
         return;
       }
       $.addClass(Index.button, 'fa-spin');
@@ -17949,7 +17951,7 @@
         });
         $.before(styleSelector.previousSibling, [$.tn('['), passLink, $.tn(']\u00A0\u00A0')]);
       }
-      if (!(Conf['JSON Navigation'] && g.VIEW === 'index')) {
+      if (!Conf['JSON Navigation'] in g.VIEW === 'thread') {
         Main.initThread();
       } else {
         $.event('4chanXInitFinished');
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 654ba1942..53721fddb 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -1,6 +1,6 @@
 // Generated by CoffeeScript
 /*
-* appchan x - Version 2.9.5 - 2014-03-15
+* appchan x - Version 2.9.5 - 2014-03-19
 *
 * Licensed under the MIT license.
 * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@@ -16527,7 +16527,9 @@
             }
           }
         }
-        e.preventDefault();
+        if (e != null) {
+          e.preventDefault();
+        }
         return;
       }
       $.addClass(Index.button, 'fa-spin');
@@ -17960,7 +17962,7 @@
         });
         $.before(styleSelector.previousSibling, [$.tn('['), passLink, $.tn(']\u00A0\u00A0')]);
       }
-      if (!(Conf['JSON Navigation'] && g.VIEW === 'index')) {
+      if (!Conf['JSON Navigation'] in g.VIEW === 'thread') {
         Main.initThread();
       } else {
         $.event('4chanXInitFinished');
diff --git a/src/General/Main.coffee b/src/General/Main.coffee
index c0d854c1e..060c6a9c6 100644
--- a/src/General/Main.coffee
+++ b/src/General/Main.coffee
@@ -196,7 +196,7 @@ Main =
       $.before styleSelector.previousSibling, [$.tn '['; passLink, $.tn ']\u00A0\u00A0']
 
     # Parse HTML or skip it and start building from JSON.
-    unless Conf['JSON Navigation'] and g.VIEW is 'index'
+    if !Conf['JSON Navigation'] of g.VIEW is 'thread'
       Main.initThread()
     else
       $.event '4chanXInitFinished'
diff --git a/src/General/Navigate.coffee b/src/General/Navigate.coffee
index 48a3b9432..6b5c8d4b1 100644
--- a/src/General/Navigate.coffee
+++ b/src/General/Navigate.coffee
@@ -195,7 +195,7 @@ Navigate =
             Index.buildIndex()
           else
             Index.update()
-      e.preventDefault()
+      e?.preventDefault()
       return
 
     $.addClass Index.button, 'fa-spin'
diff --git a/src/Linkification/Linkify.coffee b/src/Linkification/Linkify.coffee
index 2976c1072..8ae32024b 100755
--- a/src/Linkification/Linkify.coffee
+++ b/src/Linkification/Linkify.coffee
@@ -190,7 +190,7 @@ Linkify =
         embed.dataset.title = title[0]
     else
       try
-        $.cache service.api(uid), 
+        $.cache service.api(uid),
           -> title = Linkify.cb.title @, data
         ,
           responseType: 'json'