diff --git a/src/server/api/contracts/battery.contract.ts b/src/server/api/contracts/battery.contract.ts
index 846c73b..c0e703f 100644
--- a/src/server/api/contracts/battery.contract.ts
+++ b/src/server/api/contracts/battery.contract.ts
@@ -6,16 +6,17 @@ export const dashboard = oc.input(z.void()).output(dashboardSnapshotSchema)
 
 const batteryListInputSchema = z.object({
   pageSize: z.number().int().min(1).max(100).default(50),
-  cursor: z.string().min(1).optional(),
-  search: z.string().trim().min(1).max(100).optional(),
+  cursor: z.string().min(1).max(1024).optional(),
+  search: z.preprocess(
+    (value) => (typeof value === 'string' ? value.trim() || undefined : value),
+    z.string().min(1).max(100).optional(),
+  ),
   lowPower: z.boolean().optional(),
   powerStatus: z.union([z.literal(0), z.literal(1), z.literal(2)]).optional(),
   sort: z.enum(['createdAtDesc', 'createdAtAsc', 'powerDesc', 'powerAsc']).default('createdAtDesc'),
 })
 
-export const batteries = oc
-  .input(batteryListInputSchema)
-  .output(batteriesResponseSchema)
+export const batteries = oc.input(batteryListInputSchema).output(batteriesResponseSchema)
 
 export const history = oc
   .input(