diff --git a/packages/rdx-criteria/src/criteria-to-sequelize-converter.ts b/packages/rdx-criteria/src/criteria-to-sequelize-converter.ts
index 640c4a84..00c54030 100644
--- a/packages/rdx-criteria/src/criteria-to-sequelize-converter.ts
+++ b/packages/rdx-criteria/src/criteria-to-sequelize-converter.ts
@@ -174,6 +174,8 @@ export class CriteriaToSequelizeConverter implements ICriteriaToOrmConverter {
 
   private transformValue(operator: symbol, value: unknown): unknown {
     if (operator === Op.like || operator === Op.notLike) return `%${value}%`;
+    if (value === "true" || value === "false") return Boolean(value === "true");
+
     return value;
   }
 
@@ -185,16 +187,16 @@ export class CriteriaToSequelizeConverter implements ICriteriaToOrmConverter {
   }
 
   private buildOrderItem(field: string, direction: string): OrderItem {
-  if (field.includes(".")) {
-    const [associationAlias, column] = field.split(".");
+    if (field.includes(".")) {
+      const [associationAlias, column] = field.split(".");
 
-    if (!associationAlias || !column) {
-      throw new Error(`[CriteriaToSequelizeConverter] Invalid nested ORDER BY field '${field}'.`);
+      if (!(associationAlias && column)) {
+        throw new Error(`[CriteriaToSequelizeConverter] Invalid nested ORDER BY field '${field}'.`);
+      }
+
+      return [{ as: associationAlias }, column, direction] as OrderItem;
     }
 
-    return [{ as: associationAlias }, column, direction] as OrderItem;
+    return [field, direction];
   }
-
-  return [field, direction];
-}
 }
diff --git a/packages/rdx-ui/src/components/form/select-field.tsx b/packages/rdx-ui/src/components/form/select-field.tsx
index 805a07e3..f209d146 100644
--- a/packages/rdx-ui/src/components/form/select-field.tsx
+++ b/packages/rdx-ui/src/components/form/select-field.tsx
@@ -104,11 +104,12 @@ export function SelectField<TFormValues extends FieldValues>({
 
             <Select
               disabled={isDisabled}
-              onValueChange={(value: any) =>
-                onChange &&
-                onChange(deserializeValue(value)) &&
-                field.onChange(deserializeValue(value))
-              }
+              onValueChange={(value) => {
+                const nextValue = deserializeValue(value);
+
+                field.onChange(nextValue);
+                onChange?.(nextValue);
+              }}
               value={fieldValue}
             >
               <SelectTrigger