diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index d7b2ae077befd480b7637cf8a6738178315d8894..86ad7df093b25099840704502ec506e0d66a9140 100644
--- a/atdb/taskdatabase/templates/taskdatabase/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/index.html
@@ -31,7 +31,7 @@
             {% include 'taskdatabase/pagination.html' %}
         </div>
     </div>
-    <p class="footer"> Version 18 Aug 2023
+    <p class="footer"> Version 21 Aug 2023
 </div>
 
 {% include 'taskdatabase/refresh.html' %}
diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py
index c55d37d74b20e05e9b772354df3476f7a523c70a..f6c8ea3d70c3621a13313318c2a1430f666bb722 100644
--- a/atdb/taskdatabase/views.py
+++ b/atdb/taskdatabase/views.py
@@ -459,11 +459,10 @@ class ShowFinishedPage(ListView):
     @silk_profile(name='ShowFinishedPage')
     def get_queryset(self):
 
-        ##archived_tasks = Task.objects.filter(status=State.FINISHED.value)
-        ##tasks = get_filtered_tasks(self.request, archived_tasks, "sas_id")
-
-        tasks = get_filtered_tasks(self.request, None, "sas_id").filter(status=State.FINISHED.value)
+        ###archived_tasks = Task.objects.filter(status=State.FINISHED.value)
+        ###tasks = get_filtered_tasks(self.request, archived_tasks)
 
+        tasks = get_filtered_tasks(self.request).filter(status=State.FINISHED.value)
 
         paginator = Paginator(tasks, config.TASKS_PER_PAGE)  # Show 50 tasks per page
         page = self.request.GET.get('page')