diff --git a/compose/internal/repository/record.go b/compose/internal/repository/record.go
index 7b99703f2..f81743768 100644
--- a/compose/internal/repository/record.go
+++ b/compose/internal/repository/record.go
@@ -215,6 +215,8 @@ func (r record) buildQuery(module *types.Module, f types.RecordFilter) (query sq
 				return i, errors.Errorf("unknown field %q", i.Value)
 			}
 
+			field := module.Fields.FindByName(i.Value)
+
 			if !alreadyJoined(i.Value) {
 				query = query.LeftJoin(fmt.Sprintf(
 					"compose_record_value AS rv_%s ON (rv_%s.record_id = r.id AND rv_%s.name = ? AND rv_%s.deleted_at IS NULL)",
@@ -222,8 +224,16 @@ func (r record) buildQuery(module *types.Module, f types.RecordFilter) (query sq
 				), i.Value)
 			}
 
-			// @todo switch value for ref when doing Record/Owner lookup
-			i.Value = fmt.Sprintf("rv_%s.value ", i.Value)
+			switch true {
+			case field.IsRef():
+				i.Value = fmt.Sprintf("rv_%s.ref ", i.Value)
+			case field.IsNumeric():
+				i.Value = fmt.Sprintf("CAST(rv_%s.value AS SIGNED)", i.Value)
+			case field.IsDateTime():
+				i.Value = fmt.Sprintf("CAST(rv_%s.value AS DATETIME)", i.Value)
+			default:
+				i.Value = fmt.Sprintf("rv_%s.value ", i.Value)
+			}
 
 			return i, nil
 		}
diff --git a/compose/types/module_field.go b/compose/types/module_field.go
index 573bb25f4..8d56138b9 100644
--- a/compose/types/module_field.go
+++ b/compose/types/module_field.go
@@ -94,3 +94,11 @@ func (set ModuleFieldSet) FilterByModule(moduleID uint64) (ff ModuleFieldSet) {
 func (f ModuleField) IsRef() bool {
 	return f.Kind == "Record" || f.Kind == "Owner" || f.Kind == "File"
 }
+
+func (f ModuleField) IsNumeric() bool {
+	return f.Kind == "Number"
+}
+
+func (f ModuleField) IsDateTime() bool {
+	return f.Kind == "DateTime"
+}