diff --git a/backend/backend.py b/backend/backend.py
index 79b2dd07..aba9c08e 100644
--- a/backend/backend.py
+++ b/backend/backend.py
@@ -285,7 +285,8 @@ def api_watch_checknow():
                                                                         datastore=datastore)
     running_update_threads[uuid].start()
 
-    return redirect(url_for('main_page'))
+    tag = request.args.get('tag')
+    return redirect(url_for('main_page', tag=tag))
 
 
 @app.route("/api/recheckall", methods=['GET'])
@@ -313,7 +314,7 @@ def launch_checks():
     minutes = datastore.data['settings']['requests']['minutes_between_check']
     for uuid, watch in datastore.data['watching'].items():
 
-
+#@Todo https://pymotw.com/2/Queue/
         if watch['last_checked'] <= time.time() - (minutes * 60):
             running_update_threads[watch['uuid']] = fetch_site_status.perform_site_check(uuid=uuid,
                                                                                          datastore=datastore)
diff --git a/backend/templates/watch-overview.html b/backend/templates/watch-overview.html
index ae9ee6a6..b97d490a 100644
--- a/backend/templates/watch-overview.html
+++ b/backend/templates/watch-overview.html
@@ -55,7 +55,7 @@
                 </td>
                 <td>{{watch|format_last_checked_time}}</td>
                 <td>{{watch.last_changed|format_timestamp_timeago}}</td>
-                <td><a href="/api/checknow?uuid={{ watch.uuid}}" class="pure-button button-small pure-button-primary">Recheck</a>
+                <td><a href="/api/checknow?uuid={{ watch.uuid}}{% if request.args.get('tag') %}&tag={{request.args.get('tag')}}{% endif %}" class="pure-button button-small pure-button-primary">Recheck</a>
                     <a href="/edit?uuid={{ watch.uuid}}" class="pure-button button-small pure-button-primary">Edit</a>
                     {% if watch.history|length >= 2 %}
                     <a href="/diff/{{ watch.uuid}}" class="pure-button button-small pure-button-primary">Diff</a>