diff --git a/atdb/taskdatabase/tables.py b/atdb/taskdatabase/tables.py
index a3fed15a22f4b0d647d9ec73f555677a52952b51..94769e0ac7d3bc7e51d03c7aff473ee657cfe1e9 100644
--- a/atdb/taskdatabase/tables.py
+++ b/atdb/taskdatabase/tables.py
@@ -32,10 +32,10 @@ class TaskTable(tables.Table):
     #resume = ResumeColumn()
 
     actions = tables.TemplateColumn(verbose_name='Details',
-                                    template_name='query/action_buttons_per_row.html',
+                                    template_name='taskdatabase/query/action_buttons_per_row.html',
                                     orderable=False)  # orderable not sortable
 
     buttons = tables.TemplateColumn(verbose_name='Set Status',
-                                    template_name='query/status_buttons_per_row.html',
+                                    template_name='taskdatabase/query/status_buttons_per_row.html',
                                     orderable=False)  # orderable not sortable
 
diff --git a/atdb/taskdatabase/templates/taskdatabase/filter/search.html b/atdb/taskdatabase/templates/taskdatabase/filter/search.html
index 5ad2d5a56518ac9fc1bbffee7041fd9bf00ffa4f..86f8a87defd33185a262c8933347a4f6f7151d55 100644
--- a/atdb/taskdatabase/templates/taskdatabase/filter/search.html
+++ b/atdb/taskdatabase/templates/taskdatabase/filter/search.html
@@ -1,4 +1,3 @@
-<!-- note the rerouting to '/query', which is captured by urls.py -->
 
 <form class="navbar-form navbar-left" role="Search" onsubmit="writeToLocalStorage('search_box')" method="get" action="">
     <div class="form-group">
diff --git a/atdb/taskdatabase/templates/query/action_buttons_per_row.html b/atdb/taskdatabase/templates/taskdatabase/query/action_buttons_per_row.html
similarity index 100%
rename from atdb/taskdatabase/templates/query/action_buttons_per_row.html
rename to atdb/taskdatabase/templates/taskdatabase/query/action_buttons_per_row.html
diff --git a/atdb/taskdatabase/templates/query/confirm_multi_change.html b/atdb/taskdatabase/templates/taskdatabase/query/confirm_multi_change.html
similarity index 100%
rename from atdb/taskdatabase/templates/query/confirm_multi_change.html
rename to atdb/taskdatabase/templates/taskdatabase/query/confirm_multi_change.html
diff --git a/atdb/taskdatabase/templates/query/index.html b/atdb/taskdatabase/templates/taskdatabase/query/index.html
similarity index 91%
rename from atdb/taskdatabase/templates/query/index.html
rename to atdb/taskdatabase/templates/taskdatabase/query/index.html
index a37ce6095dfdd596ec649d451389317df4c1c16a..b44c1011d092ed9ad4237679294ed475b5b2870e 100644
--- a/atdb/taskdatabase/templates/query/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/query/index.html
@@ -20,7 +20,7 @@
     </div>
     {% endif %}
 
-    {% include "query/set_multi_status_panel.html" %}
+    {% include "taskdatabase/query/set_multi_status_panel.html" %}
 
     {% render_table table 'django_tables2/bootstrap4.html' %}
 
diff --git a/atdb/taskdatabase/templates/query/query.html b/atdb/taskdatabase/templates/taskdatabase/query/query.html
similarity index 100%
rename from atdb/taskdatabase/templates/query/query.html
rename to atdb/taskdatabase/templates/taskdatabase/query/query.html
diff --git a/atdb/taskdatabase/templates/query/set_multi_status_panel.html b/atdb/taskdatabase/templates/taskdatabase/query/set_multi_status_panel.html
similarity index 100%
rename from atdb/taskdatabase/templates/query/set_multi_status_panel.html
rename to atdb/taskdatabase/templates/taskdatabase/query/set_multi_status_panel.html
diff --git a/atdb/taskdatabase/templates/query/status_buttons_per_row.html b/atdb/taskdatabase/templates/taskdatabase/query/status_buttons_per_row.html
similarity index 100%
rename from atdb/taskdatabase/templates/query/status_buttons_per_row.html
rename to atdb/taskdatabase/templates/taskdatabase/query/status_buttons_per_row.html
diff --git a/atdb/taskdatabase/templates/taskdatabase/tasks.html b/atdb/taskdatabase/templates/taskdatabase/tasks.html
index a9486cfd7d50d78ae22ce5e91deeebc2dffbc109..2ecdfa5d4b488d558ee151f9325f5abedacfdf3c 100644
--- a/atdb/taskdatabase/templates/taskdatabase/tasks.html
+++ b/atdb/taskdatabase/templates/taskdatabase/tasks.html
@@ -50,6 +50,7 @@
 
             <td>{{ task.project }}</td>
             <td>{{ task.sas_id }}</td>
+            <td>{{ task.filter }} </td>
 
             <td>{{ task.creationTime|date:"Y-m-d H:i:s" }} </td>
             <td>{{ task.size_to_process|filesizeformat }} </td>
diff --git a/atdb/taskdatabase/templates/taskdatabase/tasks_headers.html b/atdb/taskdatabase/templates/taskdatabase/tasks_headers.html
index d2250230ad212678dc17515a20188904fb4a11ae..638e9c8f637421ae56f2f2705a24b33da98ec439 100644
--- a/atdb/taskdatabase/templates/taskdatabase/tasks_headers.html
+++ b/atdb/taskdatabase/templates/taskdatabase/tasks_headers.html
@@ -31,6 +31,11 @@
         SAS_ID
         <a href="{% url 'sort-tasks' 'sas_id' 'atdb' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
     </th>
+    <th>
+        <a href="{% url 'sort-tasks' '-filter' 'atdb' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
+        Filter
+        <a href="{% url 'sort-tasks' 'filter' 'atdb' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
+    </th>
     <th>
         <a href="{% url 'sort-tasks' '-creationTime' 'atdb' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
         CreationTime
diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py
index 7f39852562a48b3bf38032ca097ff684ae85f851..8e5a20249a268e2cd3fcf32b8a5da7275764b0c3 100644
--- a/atdb/taskdatabase/views.py
+++ b/atdb/taskdatabase/views.py
@@ -161,7 +161,7 @@ class QueryView(SingleTableMixin, FilterView):
     model = Task
     # queryset = Task.objects.filter(task_type='regular')
     queryset = Task.objects.all()
-    template_name = "query/index.html"
+    template_name = "taskdatabase/query/index.html"
     filterset_class = TaskFilterQueryPage
 
     def get_table_data(self):
@@ -525,7 +525,7 @@ def get_filtered_tasks(search, sort, tasks=None):
 class TaskTables2View(SingleTableView):
     model = Task
     table_class = TaskTable
-    template_name = 'query/query.html'
+    template_name = 'taskdatabase/query/query.html'
 
 
 def TaskDetails(request, id=0, page=0):