diff --git a/src/Filtering/ThreadHiding.coffee b/src/Filtering/ThreadHiding.coffee
index d5b6da291..908c52335 100644
--- a/src/Filtering/ThreadHiding.coffee
+++ b/src/Filtering/ThreadHiding.coffee
@@ -4,7 +4,7 @@ ThreadHiding =
     @db = new DataBoard 'hiddenThreads'
     return @catalogWatch() if g.VIEW is 'catalog'
     @catalogSet g.BOARD
-    $.on d, 'IndexRefresh', @onIndexRefresh
+    $.on d, 'IndexRefreshInternal', @onIndexRefresh
     Callbacks.Post.push
       name: 'Thread Hiding'
       cb:   @node
diff --git a/src/General/Index.coffee b/src/General/Index.coffee
index 870a67f1a..9c90178c6 100644
--- a/src/General/Index.coffee
+++ b/src/General/Index.coffee
@@ -126,7 +126,7 @@ Index =
       $.replace board, Index.root
       if Index.nodes
         $.event 'PostsInserted'
-        $.event 'IndexBuild'
+        $.event 'IndexRefresh'
       # Hacks:
       # - When removing an element from the document during page load,
       #   its ancestors will still be correctly created inside of it.
@@ -616,7 +616,7 @@ Index =
     Main.callbackNodes 'Thread', threads
     Main.callbackNodes 'Post',   posts
     Index.updateHideLabel()
-    $.event 'IndexRefresh'
+    $.event 'IndexRefreshInternal'
 
   buildReplies: (threads) ->
     posts = []
@@ -773,7 +773,7 @@ Index =
     $.add Index.root, nodes
     if doc.contains Index.root
       $.event 'PostsInserted'
-      $.event 'IndexBuild'
+      $.event 'IndexRefresh'
 
   buildCatalog: (threads) ->
     Index.buildCatalogViews threads
@@ -791,7 +791,7 @@ Index =
     $.add Index.root, nodes
     if doc.contains Index.root
       $.event 'PostsInserted'
-      $.event 'IndexBuild'
+      $.event 'IndexRefresh'
 
   clearSearch: ->
     Index.searchInput.value = ''
diff --git a/src/Miscellaneous/ExpandThread.coffee b/src/Miscellaneous/ExpandThread.coffee
index a1809fd52..1d3f7b0ab 100644
--- a/src/Miscellaneous/ExpandThread.coffee
+++ b/src/Miscellaneous/ExpandThread.coffee
@@ -3,7 +3,7 @@ ExpandThread =
   init: ->
     return if g.VIEW is 'thread' or !Conf['Thread Expansion']
     if Conf['JSON Index']
-      $.on d, 'IndexRefresh', @onIndexRefresh
+      $.on d, 'IndexRefreshInternal', @onIndexRefresh
     else
       Callbacks.Thread.push
         name: 'Expand Thread'
@@ -21,7 +21,7 @@ ExpandThread =
       status.req?.abort()
       delete ExpandThread.statuses[threadID]
 
-    $.off d, 'IndexRefresh', @onIndexRefresh unless refresh
+    $.off d, 'IndexRefreshInternal', @onIndexRefresh unless refresh
 
   onIndexRefresh: ->
     ExpandThread.disconnect true
diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee
index 37c95075d..40372a765 100644
--- a/src/Monitoring/ThreadWatcher.coffee
+++ b/src/Monitoring/ThreadWatcher.coffee
@@ -28,7 +28,7 @@ ThreadWatcher =
 
     switch g.VIEW
       when 'index'
-        $.on d, 'IndexRefresh', @cb.onIndexRefresh
+        $.on d, 'IndexRefreshInternal', @cb.onIndexRefresh
       when 'thread'
         $.on d, 'ThreadUpdate', @cb.onThreadRefresh
 
diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index 8fe7e0ba9..af80ea9c8 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -105,7 +105,7 @@ QR =
     $.on d, 'drop',               QR.dropFile
     $.on d, 'dragstart dragend',  QR.drag
 
-    $.on d, 'IndexRefresh', QR.generatePostableThreadsList
+    $.on d, 'IndexRefreshInternal', QR.generatePostableThreadsList
     $.on d, 'ThreadUpdate', QR.statusCheck
 
     return if !Conf['Persistent QR']