diff --git a/src/Gemstone.Data/Model/RecordFilter.cs b/src/Gemstone.Data/Model/RecordFilter.cs
index 4579c9b08..5dc5556a8 100644
--- a/src/Gemstone.Data/Model/RecordFilter.cs
+++ b/src/Gemstone.Data/Model/RecordFilter.cs
@@ -86,7 +86,9 @@ public required object? SearchParameter
                         if (value is JsonElement el)
                         {
                             //try to cast based on ValueKind
-                            if (el.ValueKind == JsonValueKind.String)
+                            if (el.ValueKind == JsonValueKind.String && ModelProperty is not null && ModelProperty.PropertyType == typeof(DateTime))
+                                field = Common.TypeConvertFromString(el.GetString() ?? "", typeof(DateTime));
+                            else if (el.ValueKind == JsonValueKind.String)
                                 field = el.GetString();
                             else if (el.ValueKind == JsonValueKind.Number)
                                 field = el.GetDouble();
@@ -94,6 +96,7 @@ public required object? SearchParameter
                                 field = el.GetBoolean();
                             else if (el.ValueKind == JsonValueKind.Array)
                             {
+                                //This doesnt handle DateTimes
                                 field = el.EnumerateArray()
                                           .Select(e =>
                                               e.ValueKind switch