diff --git a/4chan_x.user.js b/4chan_x.user.js
index 0a5cc8417..6c15c0c22 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -591,6 +591,7 @@
     node: function(post) {
       var Filter, el, firstThread, isOP, key, result, thisThread, value, _i, _len, _ref;
       if (post.isInlined) return;
+      isOP = post.isOP, el = post.el;
       for (key in filter.filters) {
         value = filter[key](post);
         if (value === false) continue;
@@ -598,7 +599,6 @@
         for (_i = 0, _len = _ref.length; _i < _len; _i++) {
           Filter = _ref[_i];
           if (!(result = Filter(value, isOP))) continue;
-          isOP = post.isOP, el = post.el;
           if (result === true) {
             if (isOP) {
               if (!g.REPLY) {
@@ -655,7 +655,7 @@
     comment: function(post) {
       var data, i, nodes, text, _ref;
       text = [];
-      nodes = d.evaluate('.//br|.//text()', post.bq, null, 7, null);
+      nodes = d.evaluate('.//br|.//text()', post.el.lastChild, null, 7, null);
       for (i = 0, _ref = nodes.snapshotLength; 0 <= _ref ? i < _ref : i > _ref; 0 <= _ref ? i++ : i--) {
         text.push((data = nodes.snapshotItem(i).data) ? data : '\n');
       }
@@ -3849,7 +3849,7 @@
         return;
       }
       if (!$.id('navtopr')) return;
-      $.addClass(d.body, "chanx_" + (VERSION.match(/\.(\d+)/)[1]));
+      $.addClass(d.body, "chanx_" + (VERSION.split('.')[1]));
       $.addClass(d.body, engine);
       _ref = ['navtop', 'navbot'];
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@@ -3924,8 +3924,7 @@
           filesize: $('.filesize', node),
           img: $('img[md5]', node),
           quotes: $$('.quotelink', node),
-          backlinks: $$('.backlink', node),
-          bq: node.lastChild
+          backlinks: $$('.backlink', node)
         });
       }
       _ref = g.callbacks;
diff --git a/script.coffee b/script.coffee
index 2d476e352..cad40a7e0 100644
--- a/script.coffee
+++ b/script.coffee
@@ -516,6 +516,7 @@ filter =
 
   node: (post) ->
     return if post.isInlined
+    {isOP, el} = post
     for key of filter.filters
       value = filter[key] post
       if value is false
@@ -524,7 +525,6 @@ filter =
       for Filter in filter.filters[key]
         unless result = Filter value, isOP
           continue
-        {isOP, el} = post
 
         # Hide
         if result is true
@@ -570,7 +570,7 @@ filter =
   comment: (post) ->
     text = []
     # XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE is 7
-    nodes = d.evaluate './/br|.//text()', post.bq, null, 7, null
+    nodes = d.evaluate './/br|.//text()', post.el.lastChild, null, 7, null
     for i in [0...nodes.snapshotLength]
       text.push if data = nodes.snapshotItem(i).data then data else '\n'
     text.join ''
@@ -3139,7 +3139,7 @@ Main =
       return
     if not $.id 'navtopr'
       return
-    $.addClass d.body, "chanx_#{VERSION.match(/\.(\d+)/)[1]}"
+    $.addClass d.body, "chanx_#{VERSION.split('.')[1]}"
     $.addClass d.body, engine
     for nav in ['navtop', 'navbot']
       $.addClass $("a[href$='/#{g.BOARD}/']", $.id nav), 'current'
@@ -3232,7 +3232,6 @@ Main =
         img:       $ 'img[md5]', node
         quotes:    $$ '.quotelink', node
         backlinks: $$ '.backlink', node
-        bq:        node.lastChild
     for callback in g.callbacks
       try
         callback post for post in posts