diff --git a/apps/dashboards/admin.py b/apps/dashboards/admin.py
index e3fdc8c..a1616a5 100644
--- a/apps/dashboards/admin.py
+++ b/apps/dashboards/admin.py
@@ -7,6 +7,7 @@
 
 @admin.register(Dashboard)
 class DashboardAdmin(AuditBaseModelAdmin):
+    filter_horizontal = ("visualizations",)
     list_display = ("title", "description", "is_published")
 
 
diff --git a/apps/sql_data/admin.py b/apps/sql_data/admin.py
index 6ecf49b..cf21f96 100644
--- a/apps/sql_data/admin.py
+++ b/apps/sql_data/admin.py
@@ -23,7 +23,9 @@ class SQLDatabaseSourceAdmin(AuditBaseModelAdmin):
 
 @admin.register(SQLExtractMetadata)
 class SQLExtractMetadataAdmin(AuditBaseModelAdmin):
+    filter_horizontal = ("applicable_source_versions",)
     list_display = ("name", "version", "description")
+    list_filter = ("data_source",)
 
 
 @admin.register(SQLUploadChunk)
@@ -45,3 +47,4 @@ class SQLUploadMetadataAdmin(AuditBaseModelAdmin):
         "finish_time",
         "is_complete",
     )
+    list_filter = ("extract_metadata", "org_unit_code", "org_unit_name")