diff --git a/tubearchivist/home/templates/home/channel_id.html b/tubearchivist/home/templates/home/channel_id.html
index 9539f58d..fc85d0f0 100644
--- a/tubearchivist/home/templates/home/channel_id.html
+++ b/tubearchivist/home/templates/home/channel_id.html
@@ -22,7 +22,7 @@
             <a href="{% url 'downloads' %}?channel={{ channel_info.channel_id }}"><h3>Downloads</h3></a>
         {% endif %}
     </div>
-    <div id="notifications" data="channel"></div>
+    <div id="notifications" data="channel reindex"></div>
     <div class="info-box info-box-2">
         <div class="info-box-item">
             <div class="round-img">
diff --git a/tubearchivist/home/templates/home/channel_id_about.html b/tubearchivist/home/templates/home/channel_id_about.html
index 1a9b782f..dc38b7ac 100644
--- a/tubearchivist/home/templates/home/channel_id_about.html
+++ b/tubearchivist/home/templates/home/channel_id_about.html
@@ -22,7 +22,7 @@
             <a href="{% url 'downloads' %}?channel={{ channel_info.channel_id }}"><h3>Downloads</h3></a>
         {% endif %}
     </div>
-    <div id="notifications" data="channel"></div>
+    <div id="notifications" data="channel reindex"></div>
     <div class="info-box info-box-3">
         <div class="info-box-item">
             <div class="round-img">
diff --git a/tubearchivist/home/templates/home/channel_id_playlist.html b/tubearchivist/home/templates/home/channel_id_playlist.html
index cf07f003..971e41ed 100644
--- a/tubearchivist/home/templates/home/channel_id_playlist.html
+++ b/tubearchivist/home/templates/home/channel_id_playlist.html
@@ -22,7 +22,7 @@
             <a href="{% url 'downloads' %}?channel={{ channel_info.channel_id }}"><h3>Downloads</h3></a>
         {% endif %}
     </div>
-    <div id="notifications" data="channel"></div>
+    <div id="notifications" data="channel reindex"></div>
     <div class="view-controls">
         <div class="toggle">
             <span>Show subscribed only:</span>
diff --git a/tubearchivist/home/templates/home/settings.html b/tubearchivist/home/templates/home/settings.html
index e239e1bd..15191364 100644
--- a/tubearchivist/home/templates/home/settings.html
+++ b/tubearchivist/home/templates/home/settings.html
@@ -2,7 +2,7 @@
 {% load static %}
 {% block content %}
 <div class="boxed-content">
-    <div id="notifications" data="setting"></div>
+    <div id="notifications" data="setting reindex"></div>
     <div class="title-bar">
         <h1>User Configurations</h1>
     </div>
diff --git a/tubearchivist/static/progress.js b/tubearchivist/static/progress.js
index 36e7ede8..a2b35daf 100644
--- a/tubearchivist/static/progress.js
+++ b/tubearchivist/static/progress.js
@@ -31,7 +31,7 @@ function getMessages(dataOrigin) {
 function buildMessage(responseData, dataOrigin) {
   // filter relevant messages
   let messages = responseData.filter(function (value) {
-    return value.group.startsWith(dataOrigin);
+    return dataOrigin.split(' ').includes(value.group.split(':')[0]);
   }, dataOrigin);
   let notifications = document.getElementById('notifications');
   let currentNotifications = notifications.childElementCount;
diff --git a/tubearchivist/static/script.js b/tubearchivist/static/script.js
index c79f918e..5df3f08b 100644
--- a/tubearchivist/static/script.js
+++ b/tubearchivist/static/script.js
@@ -136,6 +136,9 @@ function reindex(button) {
   let message = document.createElement('p');
   message.innerText = 'Reindex scheduled';
   document.getElementById('reindex-button').replaceWith(message);
+  setTimeout(function () {
+    checkMessages();
+  }, 500);
 }
 
 // download page buttons