diff --git a/atdb/taskdatabase/static/taskdatabase/style.css b/atdb/taskdatabase/static/taskdatabase/style.css
index 8a2a52ca00b810b8fb45001ffaefea37d8b35a49..c738d2e7157610c74fb40d574d94546d593fb65a 100644
--- a/atdb/taskdatabase/static/taskdatabase/style.css
+++ b/atdb/taskdatabase/static/taskdatabase/style.css
@@ -3,7 +3,7 @@ TD {
   font-size: 12pt;
 }
 
-.defined, .completed, .complete, .defined_ldv {
+.defined, .completed, .complete, {
   background-color: lemonchiffon;
   color: blue;
 }
@@ -15,19 +15,17 @@ TD {
  color: green;
  font-weight: bold;
 }
-.created {
+.submitted {
   background-color: lemonchiffon;
   color: blue;
 }
 .valid_priority {
   color: green;
 }
-.valid, .combining{
+.valid, .ingested{
   color: green;
 }
-.copied {
-  color: black;
-}
+
 .archived {
   color: black;
 }
@@ -44,7 +42,7 @@ TD {
  color: green;
  font-weight: bold;
 }
-.checking,.starting,.removing,.cleanup {
+.staging,.submitting,.running,.ingesting {
 font-style: italic;
 }
 
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index 461211b2a890456a57432d372f304ef4e0d380cf..cf720fddf1de5bf77d5d223f6b7a6743b2fe18bf 100644
--- a/atdb/taskdatabase/templates/taskdatabase/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/index.html
@@ -46,7 +46,7 @@
     </div>
     {% include 'taskdatabase/pagination.html' %}
 </div>
-    <p class="footer"> Version 2.0.0 (15 dec 2020 - 16:00)</p>
+    <p class="footer"> Version 2.0.0 (17 dec 2020 - 11:30)</p>
 
     <script type="text/javascript">
         (function(seconds) {
diff --git a/atdb/taskdatabase/templates/taskdatabase/observations.html b/atdb/taskdatabase/templates/taskdatabase/observations.html
index 8564e3f5be4a12b127f627ccb85be8e6d21c2761..1f4e84111504cd49b0edd715a26d94373a1df36c 100644
--- a/atdb/taskdatabase/templates/taskdatabase/observations.html
+++ b/atdb/taskdatabase/templates/taskdatabase/observations.html
@@ -62,12 +62,12 @@
                 {% endif %}
 
                 {% if observation.my_status == "ingesting" %}
-                <a href="https://alta.astron.nl/science/monitor" class="btn btn-primary btn-sm" target="_blank" role="button">ALTA View</a>
+                <a href="https://alta.astron.nl/science/monitor" class="btn btn-primary btn-sm" target="_blank" role="button">Monitor</a>
                 {% endif %}
 
                 {% if not "bad" in observation.quality %}
                     {% if observation.my_status == "archived" or observation.my_status == "removed" %}
-                    <a href="https://alta.astron.nl/science/details/{{ observation.taskID }}" class="btn btn-primary btn-sm" target="_blank" role="button">ALTA View</a>
+                    <a href="https://alta.astron.nl/science/details/{{ observation.taskID }}" class="btn btn-primary btn-sm" target="_blank" role="button">Monitor</a>
                     {% endif %}
                 {% endif %}
 
diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py
index 15a3be694255fd765a6a022d4c2a2f44cb3326c9..b9d809e6bbda7e88709f7b2c1cc480536507b4e2 100644
--- a/atdb/taskdatabase/views.py
+++ b/atdb/taskdatabase/views.py
@@ -73,7 +73,7 @@ class DataProductFilter(filters.FilterSet):
 class StatusFilter(filters.FilterSet):
 
     # A direct filter on a @property field is not possible, this simulates that behaviour
-    # taskID = filters.Filter(field_name="taskObject__taskID",lookup_expr='exact')
+    taskID = filters.Filter(field_name="taskObject__taskID",lookup_expr='exact')
 
     class Meta:
         model = Status
@@ -86,7 +86,6 @@ class StatusFilter(filters.FilterSet):
             'taskObject__taskID': ['exact', 'in'],
             # 'taskID': ['exact', 'in'],
 
-            #'derived_taskid' : ['exact', 'in']
         }
 
 # this uses a form