diff --git a/server/AyaNova/DataList/DataListFetcher.cs b/server/AyaNova/DataList/DataListFetcher.cs
index d2d9e0b2..b4a58b6e 100644
--- a/server/AyaNova/DataList/DataListFetcher.cs
+++ b/server/AyaNova/DataList/DataListFetcher.cs
@@ -74,15 +74,16 @@ namespace AyaNova.DataList
             var qFrom = DataList.SQLFrom;
 
             //FILTERED?
-            DataListFilter TheFilter = null;
+            bool HasFilter = !string.IsNullOrWhiteSpace(listOptions.FilterJson);
+            bool HasSort = !string.IsNullOrWhiteSpace(listOptions.SortJson);
             var qWhere = string.Empty;
             var qOrderBy = string.Empty;
-            if (!string.IsNullOrWhiteSpace(listOptions.FilterJson))
+            if (HasFilter)
             {
                 //WHERE CLAUSE - FILTER            
                 qWhere = DataListSqlFilterCriteriaBuilder.DataFilterToSQLCriteria(DataList.FieldDefinitions, listOptions.FilterJson, DataList.FieldDefinitions, UserId);
             }
-            if (!string.IsNullOrWhiteSpace(listOptions.SortJson))
+            if (HasSort)
             {
                 //ORDER BY CLAUSE - SORT 
                 //BUILD ORDER BY 
@@ -102,7 +103,7 @@ namespace AyaNova.DataList
             //PUT IT ALL TOGETHER
             string qDataQuery = string.Empty;
             string qTotalRecordsQuery = string.Empty;
-            if (TheFilter != null)
+            if (HasFilter)
             {
                 qDataQuery = $"{qSelectColumns} {qFrom} {qWhere} {qOrderBy} {qLimitOffset}";
                 qTotalRecordsQuery = $"SELECT COUNT(*) {qFrom} {qWhere}";