diff --git a/scipost/static/scipost/assets/css/scipost-physics.scss b/scipost/static/scipost/assets/css/scipost-physics.scss
index d0d2f46eccba15998393c6432fbbe06497279530..2ef6f06c4c2a5c37552e7e18bd940d3181fcd211 100644
--- a/scipost/static/scipost/assets/css/scipost-physics.scss
+++ b/scipost/static/scipost/assets/css/scipost-physics.scss
@@ -17,8 +17,8 @@
             display: block;
 
             &.active {
-                border: 1px solid #6885c3;
-                color: #6885c3;
+                color: #002b49;
+                background: rgba(255, 255, 255, 0.5);
             }
         }
     }
diff --git a/scipost/views.py b/scipost/views.py
index 6ba474479ab4bad1b5ea91428f7b868cba78390b..0e2fd0e176ed61e8a2ec1e840eb3e44724b726f1 100644
--- a/scipost/views.py
+++ b/scipost/views.py
@@ -122,9 +122,8 @@ def documentsSearchResults(query):
         commentary_query,
         vetted=True,
         ).order_by('-pub_date')
-    submission_search_queryset = Submission.objects.filter(
+    submission_search_queryset = Submission.objects.public().filter(
         submission_query,
-        ).exclude(status__in=SUBMISSION_STATUS_PUBLICLY_UNLISTED,
         ).order_by('-submission_date')
     thesislink_search_list = ThesisLink.objects.filter(
         thesislink_query,
diff --git a/submissions/managers.py b/submissions/managers.py
index 01249dd9dbfa9cadb97a81b545e1f1e1bf5a2bf0..9346d76a55b1d85e35bac79a4d0af3065aba3e31 100644
--- a/submissions/managers.py
+++ b/submissions/managers.py
@@ -14,7 +14,7 @@ class SubmissionManager(models.Manager):
                 .order_by('-submission_date')
 
     def public(self):
-        return self.exclude(status__in=SUBMISSION_STATUS_PUBLICLY_UNLISTED)
+        return self.filter(is_current=True).exclude(status__in=SUBMISSION_STATUS_PUBLICLY_UNLISTED)
 
 
 class EditorialAssignmentManager(models.Manager):
diff --git a/submissions/views.py b/submissions/views.py
index 2e28d88ef2d30f64a3c7f2df08b0f5f1ad0139be..b82aeebb2e1ac1c36012d61b675d19cfa30bc6ef 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -208,34 +208,26 @@ class SubmissionListView(ListView):
     paginate_by = 10
 
     def get_queryset(self):
+        queryset = Submission.objects.public()
         if 'to_journal' in self.kwargs:
-            queryset = Submission.objects.filter(
+            queryset = queryset.filter(
                 latest_activity__gte=timezone.now() + datetime.timedelta(days=-60),
                 submitted_to_journal=self.kwargs['to_journal']
-            ).exclude(status__in=SUBMISSION_STATUS_PUBLICLY_UNLISTED
-                      ).exclude(is_current=False).order_by('-submission_date')
-            # Submission.objects.filter(submitted_to_journal=self.kwargs['to_journal'])
+            )
         elif 'discipline' in self.kwargs and 'nrweeksback' in self.kwargs:
             discipline = self.kwargs['discipline']
             nrweeksback = self.kwargs['nrweeksback']
-            queryset = Submission.objects.filter(
+            queryset = queryset.filter(
                 discipline=discipline,
                 latest_activity__gte=timezone.now() + datetime.timedelta(weeks=-int(nrweeksback)))
         elif 'Submit' in self.request.GET:
-            queryset = Submission.objects.filter(
+            queryset = queryset.filter(
                 title__icontains=self.request.GET.get('title_keyword', ''),
                 author_list__icontains=self.request.GET.get('author', ''),
                 abstract__icontains=self.request.GET.get('abstract_keyword', '')
             )
-        else:
-            queryset = Submission.objects.filter(
-                latest_activity__gte=timezone.now() + datetime.timedelta(days=-60)
-            ).exclude(status__in=SUBMISSION_STATUS_PUBLICLY_UNLISTED
-                      ).exclude(is_current=False).order_by('-submission_date')
-
-        queryset = queryset.exclude(status__in=SUBMISSION_STATUS_PUBLICLY_UNLISTED,
-                                    ).order_by('-submission_date')
-        return queryset
+
+        return queryset.order_by('-submission_date')
 
     def get_context_data(self, **kwargs):
         # Call the base implementation first to get a context