diff --git a/server/AyaNova/DataList/DataListFetcher.cs b/server/AyaNova/DataList/DataListFetcher.cs
index b4a58b6e..04375ca7 100644
--- a/server/AyaNova/DataList/DataListFetcher.cs
+++ b/server/AyaNova/DataList/DataListFetcher.cs
@@ -81,7 +81,7 @@ namespace AyaNova.DataList
             if (HasFilter)
             {
                 //WHERE CLAUSE - FILTER            
-                qWhere = DataListSqlFilterCriteriaBuilder.DataFilterToSQLCriteria(DataList.FieldDefinitions, listOptions.FilterJson, DataList.FieldDefinitions, UserId);
+                qWhere = DataListSqlFilterCriteriaBuilder.DataFilterToSQLCriteria(DataList.FieldDefinitions, listOptions.FilterJson, UserId);
             }
             if (HasSort)
             {
diff --git a/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs b/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs
index 63c30525..04e4f653 100644
--- a/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs
+++ b/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs
@@ -11,7 +11,7 @@ namespace AyaNova.DataList
 {
     public static class DataListSqlFilterCriteriaBuilder
     {
-        public static string DataFilterToSQLCriteria(List<AyaDataListFieldDefinition> objectFieldsList, string filterJson, List<AyaDataListFieldDefinition> objectFields, long userId)
+        public static string DataFilterToSQLCriteria(List<AyaDataListFieldDefinition> objectFieldsList, string filterJson, long userId)
         {
 
             if (string.IsNullOrWhiteSpace(filterJson))
@@ -38,7 +38,7 @@ namespace AyaNova.DataList
                     tagList = filterItem["value"].ToObject<List<String>>();
                 }
 
-                var dataType = objectFields.Find(x => x.FieldKey.ToLowerInvariant() == fld).UiFieldDataType;
+                var dataType = objectFieldsList.Find(x => x.FieldKey.ToLowerInvariant() == fld).UiFieldDataType;
                 sb.Append("(");
 
                 //Get the correct sql column name