diff --git a/atdb/taskdatabase/templates/taskdatabase/archived/clear_filter_button.html b/atdb/taskdatabase/templates/taskdatabase/archived/clear_filter_button.html
new file mode 100644
index 0000000000000000000000000000000000000000..b2da212620c1c42046a86495b44414e2a2c906d2
--- /dev/null
+++ b/atdb/taskdatabase/templates/taskdatabase/archived/clear_filter_button.html
@@ -0,0 +1,3 @@
+
+   <a href="{% url 'clear-filter' 'finished' %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-window-close"></i> Clear Filter</a>
+
diff --git a/atdb/taskdatabase/templates/taskdatabase/archived/filter_buttons.html b/atdb/taskdatabase/templates/taskdatabase/archived/filter_buttons.html
new file mode 100644
index 0000000000000000000000000000000000000000..f3439f4aff9852e1e1beaf8aedee6f9492048090
--- /dev/null
+++ b/atdb/taskdatabase/templates/taskdatabase/archived/filter_buttons.html
@@ -0,0 +1,20 @@
+
+
+        <div class="card">
+         <div class="card-body">
+           <table>
+
+             <tr>
+               <td>
+                   {% include "taskdatabase/archived/clear_filter_button.html" %}
+               </td>
+                 <td>
+                     {% include 'taskdatabase/filter/search.html' %}
+                 </td>
+             </tr>
+
+           </table>
+         </div>
+        </div>
+
+
diff --git a/atdb/taskdatabase/templates/taskdatabase/archived/page.html b/atdb/taskdatabase/templates/taskdatabase/archived/page.html
index 6bd1f77d1a453d48bae4a7fd7ffee969929a51e8..27982943c1f2f5f8bff45a04acbf6b319f289a65 100644
--- a/atdb/taskdatabase/templates/taskdatabase/archived/page.html
+++ b/atdb/taskdatabase/templates/taskdatabase/archived/page.html
@@ -10,8 +10,8 @@
             <div class="col-12">
                 <h3>Finished</h3>
                 This overview shows the tasks that are <b>finished</b> and ingested into the LTA.
-                <hr>
-                <td>{% include 'taskdatabase/filter/search.html' %}</td>
+
+                {% include 'taskdatabase/archived/filter_buttons.html' %}&nbsp;
             </div>
         </div>
         <div class="row">
diff --git a/atdb/taskdatabase/templates/taskdatabase/failures/page.html b/atdb/taskdatabase/templates/taskdatabase/failures/page.html
index f1e742b8a79a530331eeb4c7f180465646417515..161f50b9825c3ee60bf7e4473906c44a284e803f 100644
--- a/atdb/taskdatabase/templates/taskdatabase/failures/page.html
+++ b/atdb/taskdatabase/templates/taskdatabase/failures/page.html
@@ -11,7 +11,7 @@
                 <h3>Failures</h3>
                 These are all the tasks that <b>failed</b>.
                 Click 'Retry' to restart the this step in the workflow (see 'Diagram' in top menu).
-                <hr>
+
                 {% include 'taskdatabase/failures/filter_buttons.html' %}&nbsp;
 
             </div>
diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/clear_filter_button.html b/atdb/taskdatabase/templates/taskdatabase/validation/clear_filter_button.html
new file mode 100644
index 0000000000000000000000000000000000000000..6787f10079150443357d4fdd515a27beb73264f1
--- /dev/null
+++ b/atdb/taskdatabase/templates/taskdatabase/validation/clear_filter_button.html
@@ -0,0 +1,3 @@
+
+   <a href="{% url 'clear-filter' 'validation' %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-window-close"></i> Clear Filter</a>
+
diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/filter_buttons.html b/atdb/taskdatabase/templates/taskdatabase/validation/filter_buttons.html
new file mode 100644
index 0000000000000000000000000000000000000000..54e0fffdaee2fc21ad999d1a78a81ee2293c769b
--- /dev/null
+++ b/atdb/taskdatabase/templates/taskdatabase/validation/filter_buttons.html
@@ -0,0 +1,21 @@
+
+
+        <div class="card">
+         <div class="card-body">
+           <table>
+
+             <tr>
+               <td>
+                   {% include "taskdatabase/validation/clear_filter_button.html" %}
+
+               </td>
+                 <td>
+                     {% include 'taskdatabase/filter/search.html' %}
+                 </td>
+             </tr>
+
+           </table>
+         </div>
+        </div>
+
+
diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/page.html b/atdb/taskdatabase/templates/taskdatabase/validation/page.html
index b2434b97b96fefe312110eaa38d3dd2bb450985e..195d5557185a9a48a6fca2b79cb799ef805a9591 100644
--- a/atdb/taskdatabase/templates/taskdatabase/validation/page.html
+++ b/atdb/taskdatabase/templates/taskdatabase/validation/page.html
@@ -13,9 +13,7 @@
 
                 These are the SAS_ID's in status <b>stored</b> that can be validated. Click one of the quality buttons to validate.
 
-                <td>{% include 'taskdatabase/filter/search.html' %}</td>
-
-                <hr>
+                 {% include 'taskdatabase/validation/filter_buttons.html' %}&nbsp;
             </div>
         </div>
         <div class="row">
diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py
index 281cdf6a9c05fd749371fc2b39a5eb1540e3e4ac..c6cb9235324b45cc80eea81b232195b29b0f5f2d 100644
--- a/atdb/taskdatabase/views.py
+++ b/atdb/taskdatabase/views.py
@@ -1350,18 +1350,11 @@ def TaskClearFilter(request, redirect_to_page):
     request.session['search_box'] = ''
     request.session['filtered'] = False
 
+    try:
+        return redirect(redirect_to_page)
+    except:
+        return redirect_with_params('index', '?page=1')
 
-    if redirect_to_page == 'quality':
-        return redirect('quality')
-    if redirect_to_page == 'query':
-        return redirect('query')
-    if redirect_to_page == 'discarded':
-        return redirect('discarded')
-    if redirect_to_page == 'ingest':
-        return redirect('ingest')
-    if redirect_to_page == 'failures':
-        return redirect('failures')
-    return redirect_with_params('index', '?page=1')
 
 
 @login_required