diff --git a/server/helpers/data.py b/server/helpers/data.py
index a9bfdb7..5e9f623 100644
--- a/server/helpers/data.py
+++ b/server/helpers/data.py
@@ -50,7 +50,7 @@ def get_pagination(args):
     return int(args.get('limit', 10)),  int(args.get('offset', 0))
 
 def get_sort(args):
-    return args.get('sort_column'), args.get('sort_order', None)
+    return args.get('sort_column'), args.get('sort_order')
 
 def get_items(args, db_model, q_query, default_tsv_fields):
 
diff --git a/server/rest/sample_location/sample_locations_service.py b/server/rest/sample_location/sample_locations_service.py
index 3a64656..7002c0b 100644
--- a/server/rest/sample_location/sample_locations_service.py
+++ b/server/rest/sample_location/sample_locations_service.py
@@ -16,9 +16,8 @@ def get_sample_locations(offset=0, limit=10000, lineage=None, sample_type=None,
     if lineage:
         query &= Q(lineage=str(lineage))
 
-    if sample_type:
-        if sample_type in ['local_sample', 'biosample']:
-            query &= Q(is_local_sample=(sample_type == 'local_sample'))
+    if sample_type and sample_type in ['local_sample', 'biosample']:
+        query &= Q(is_local_sample=(sample_type == 'local_sample'))
     
     # Apply filtering if needed
     if filter: