diff --git a/peachjam/views/courts.py b/peachjam/views/courts.py
index c75e40ec9..7203a78a3 100644
--- a/peachjam/views/courts.py
+++ b/peachjam/views/courts.py
@@ -38,18 +38,14 @@ def get_context_data(self, **kwargs):
 
         context["doc_type"] = "Judgment"
         context["page_title"] = self.page_title()
-        context["labels"].update({"judge": Judge.model_label_plural})
         context["doc_table_show_jurisdiction"] = False
 
         self.populate_years(context)
-        self.populate_facets(context)
-        self.show_facet_clear_all(context)
-
         context["documents"] = self.group_documents(context["documents"])
 
         return context
 
-    def populate_facets(self, context):
+    def add_facets(self, context):
         context["facet_data"] = {}
         if "judges" not in self.exclude_facets:
             judges = list(
@@ -63,7 +59,7 @@ def populate_facets(self, context):
                 if judge
             )
             context["facet_data"]["judges"] = {
-                "label": _("Judges"),
+                "label": Judge.model_label_plural,
                 "type": "checkbox",
                 "options": judges,
                 "values": self.request.GET.getlist("judges"),
@@ -105,6 +101,24 @@ def populate_facets(self, context):
                 "values": self.request.GET.getlist("attorneys"),
             }
 
+        if "taxonomy" not in self.exclude_facets:
+            taxonomies = list(
+                self.form.filter_queryset(
+                    self.get_base_queryset(), exclude="taxonomies"
+                )
+                .filter(taxonomies__topic__isnull=False)
+                .order_by("taxonomies__topic__name")
+                .values_list("taxonomies__topic__name", flat=True)
+                .distinct()
+            )
+
+            context["facet_data"]["taxonomies"] = {
+                "label": _("Topics"),
+                "type": "checkbox",
+                "options": taxonomies,
+                "values": self.request.GET.getlist("taxonomies"),
+            }
+
         if "alphabet" not in self.exclude_facets:
             context["facet_data"]["alphabet"] = {
                 "label": _("Alphabet"),
diff --git a/peachjam/views/generic_views.py b/peachjam/views/generic_views.py
index f7cb923be..af91ae297 100644
--- a/peachjam/views/generic_views.py
+++ b/peachjam/views/generic_views.py
@@ -136,7 +136,6 @@ def get_context_data(self, **kwargs):
         self.add_facets(context)
         self.show_facet_clear_all(context)
         context["doc_count"] = context["paginator"].count
-        context["labels"] = {"author": Author.model_label}
 
         return context
 
@@ -174,7 +173,7 @@ def add_facets(self, context):
         taxonomies = list(
             self.form.filter_queryset(self.get_base_queryset(), exclude="taxonomies")
             .filter(taxonomies__topic__isnull=False)
-            .order_by()
+            .order_by("taxonomies__topic__name")
             .values_list("taxonomies__topic__name", flat=True)
             .distinct()
         )
@@ -189,7 +188,7 @@ def add_facets(self, context):
                 "values": self.request.GET.getlist("years"),
             },
             "authors": {
-                "label": _("Authors"),
+                "label": Author.model_label_plural,
                 "type": "checkbox",
                 "options": authors,
                 "values": self.request.GET.getlist("authors"),