diff --git a/src/Filtering/Filter.coffee b/src/Filtering/Filter.coffee
index e2f4da438..3bb1bca28 100644
--- a/src/Filtering/Filter.coffee
+++ b/src/Filtering/Filter.coffee
@@ -134,7 +134,6 @@ Filter =
       if hl
         @highlights = hl
         $.addClass @nodes.root, hl...
-      @thread.isOnTop = top
     return
 
   isHidden: (post) ->
diff --git a/src/General/Index.coffee b/src/General/Index.coffee
index 755466bfb..87f1121ca 100644
--- a/src/General/Index.coffee
+++ b/src/General/Index.coffee
@@ -591,8 +591,13 @@ Index =
     Index.liveThreadData    = pages.reduce ((arr, next) -> arr.concat next.threads), []
     Index.liveThreadIDs     = Index.liveThreadData.map (data) -> data.no
     Index.liveThreadDict    = {}
+    Index.parsedThreads     = {}
     for data in Index.liveThreadData
       Index.liveThreadDict[data.no] = data
+      Index.parsedThreads[data.no] = obj = Build.parseJSON data, g.BOARD.ID
+      results = Filter.test obj
+      obj.isOnTop  = results.top
+      obj.isHidden = results.hide
     if Index.liveThreadData[0]
       Build.spoilerRange[g.BOARD.ID] = Index.liveThreadData[0].custom_spoiler
     g.BOARD.threads.forEach (thread) ->
@@ -727,17 +732,17 @@ Index =
     if Index.search and (threadIDs = Index.querySearch Index.search)
       Index.sortedThreadIDs = threadIDs
     # Sticky threads
-    Index.sortOnTop (thread) -> thread.isSticky
+    Index.sortOnTop (obj) -> obj.isSticky
     # Highlighted threads
-    Index.sortOnTop (thread) -> thread.isOnTop or Conf['Pin Watched Threads'] and ThreadWatcher.isWatched thread
+    Index.sortOnTop (obj) -> obj.isOnTop or Conf['Pin Watched Threads'] and ThreadWatcher.isWatchedRaw(obj.boardID, obj.threadID)
     # Non-hidden threads
-    Index.sortOnTop((thread) -> !thread.isHidden) if Conf['Anchor Hidden Threads']
+    Index.sortOnTop((obj) -> !obj.isHidden) if Conf['Anchor Hidden Threads']
 
   sortOnTop: (match) ->
     topThreads    = []
     bottomThreads = []
     for ID in Index.sortedThreadIDs
-      (if match g.BOARD.threads[ID] then topThreads else bottomThreads).push ID
+      (if match Index.parsedThreads[ID] then topThreads else bottomThreads).push ID
     Index.sortedThreadIDs = topThreads.concat bottomThreads
 
   buildIndex: ->
@@ -746,7 +751,7 @@ Index =
       when 'all pages'
         threadIDs = Index.sortedThreadIDs
       when 'catalog'
-        threadIDs = Index.sortedThreadIDs.filter (ID) -> !g.BOARD.threads[ID].isHidden isnt Index.showHiddenThreads
+        threadIDs = Index.sortedThreadIDs.filter (ID) -> !Index.parsedThreads[ID].isHidden isnt Index.showHiddenThreads
       else
         threadIDs = Index.threadsOnPage Index.currentPage
     threads = threadIDs.map (ID) -> g.BOARD.threads[ID]
@@ -820,10 +825,10 @@ Index =
   querySearch: (query) ->
     return if not (keywords = query.toLowerCase().match /\S+/g)
     Index.sortedThreadIDs.filter (ID) ->
-      Index.searchMatch g.BOARD.threads[ID], keywords
+      Index.searchMatch Index.parsedThreads[ID], keywords
 
-  searchMatch: (thread, keywords) ->
-    {info, file} = thread.OP
+  searchMatch: (obj, keywords) ->
+    {info, file} = obj
     text = []
     for key in ['comment', 'subject', 'name', 'tripcode', 'email']
       text.push info[key] if key of info
diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee
index 6233d1aad..1b295c439 100644
--- a/src/Monitoring/ThreadWatcher.coffee
+++ b/src/Monitoring/ThreadWatcher.coffee
@@ -72,6 +72,9 @@ ThreadWatcher =
   isWatched: (thread) ->
     !!ThreadWatcher.db?.get {boardID: thread.board.ID, threadID: thread.ID}
 
+  isWatchedRaw: (boardID, threadID) ->
+    !!ThreadWatcher.db?.get {boardID, threadID}
+
   setToggler: (toggler, isWatched) ->
     toggler.classList.toggle 'watched', isWatched
     toggler.title = "#{if isWatched then 'Unwatch' else 'Watch'} Thread"
diff --git a/src/classes/Thread.coffee b/src/classes/Thread.coffee
index 8bd91a875..b826f04a5 100644
--- a/src/classes/Thread.coffee
+++ b/src/classes/Thread.coffee
@@ -6,7 +6,6 @@ class Thread
     @posts      = new SimpleDict()
     @isDead     = false
     @isHidden   = false
-    @isOnTop    = false
     @isSticky   = false
     @isClosed   = false
     @isArchived = false