diff --git a/pkg/query_builder/mysql/filter.go b/pkg/query_builder/mysql/filter.go
index adaea097..4e2ff088 100644
--- a/pkg/query_builder/mysql/filter.go
+++ b/pkg/query_builder/mysql/filter.go
@@ -2,23 +2,20 @@ package mysqlquerybuilder
 
 import (
 	"fmt"
-	"reflect"
-	"time"
+	"regexp"
 )
 
-const DateFormat = "2006-01-02"
+var datePattern = regexp.MustCompile(`^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}:\d{2}Z)?$`)
 
-func isTimeType(value interface{}) bool {
-	return reflect.TypeOf(value) == reflect.TypeOf(time.Time{})
+func isValidDateOrDateTime(value string) bool {
+	return datePattern.MatchString(value)
 }
 
-// BuildFilterQuery constructs the query and handles datetime fields
 func BuildFilterQuery(filter map[string]interface{}) (filterQuery string, args []any) {
 	for key, value := range filter {
-		if isTimeType(value) {
+		if strVal, ok := value.(string); ok && isValidDateOrDateTime(strVal) {
 			filterQuery += fmt.Sprintf("AND DATE(%s) = ? ", key)
-			dateValue := value.(time.Time).Format(DateFormat)
-			args = append(args, dateValue)
+			args = append(args, strVal)
 		} else {
 			filterQuery += fmt.Sprintf("AND %s = ? ", key)
 			args = append(args, value)