diff --git a/apps/sql_data/apiviews.py b/apps/sql_data/apiviews.py
index f0892f8..8360fe0 100644
--- a/apps/sql_data/apiviews.py
+++ b/apps/sql_data/apiviews.py
@@ -28,7 +28,7 @@ class DataSourceVersionViewSet(AuditBaseViewSet):
 
     queryset = DataSourceVersion.objects.all()
     serializer_class = DataSourceVersionSerializer
-    filterset_fields = ["id", "data_source", "data_source_version"]
+    filterset_fields = ("id", "data_source", "data_source_version")
 
 
 class SQLDatabaseViewSet(AuditBaseViewSet):
@@ -36,7 +36,7 @@ class SQLDatabaseViewSet(AuditBaseViewSet):
 
     queryset = SQLDatabaseSource.objects.all()
     serializer_class = SQLDatabaseSerializer
-    filterset_fields = ["id", "name", "database_name", "database_vendor"]
+    filterset_fields = ("id", "name", "database_name", "database_vendor")
 
 
 class SQLExtractMetadataViewSet(AuditBaseViewSet):
@@ -46,13 +46,14 @@ class SQLExtractMetadataViewSet(AuditBaseViewSet):
         "applicable_source_versions", "data_source"
     ).all()
     serializer_class = SQLExtractMetadataSerializer
-    filterset_fields = [
+    filterset_fields = (
         "id",
         "name",
-        "data_source__database_name",
+        "data_source",
+        "applicable_source_versions",
         "version",
         "preferred_uploads_name",
-    ]
+    )
 
 
 class SQLUploadChunkViewSet(
@@ -65,6 +66,10 @@ class SQLUploadChunkViewSet(
 
     queryset = SQLUploadChunk.objects.all()
     serializer_class = SQLUploadChunkSerializer
+    filterset_fields = (
+        "id",
+        "upload_metadata",
+    )
 
 
 class SQLUploadMetadataViewSet(AuditBaseViewSet):
@@ -74,6 +79,15 @@ class SQLUploadMetadataViewSet(AuditBaseViewSet):
         "upload_chunks"
     ).all()
     serializer_class = SQLUploadMetadataSerializer
+    filterset_fields = (
+        "id",
+        "extract_metadata",
+        "org_unit_code",
+        "org_unit_name",
+        "start_time",
+        "finish_time",
+        "is_consumed",
+    )
 
     @action(
         detail=True,