diff --git a/src/routes/songs/+page.svelte b/src/routes/songs/+page.svelte
index 70c4f84..cd83f42 100644
--- a/src/routes/songs/+page.svelte
+++ b/src/routes/songs/+page.svelte
@@ -7,7 +7,6 @@
 	import { db as clientDb } from "$lib/db/client-db";
 	import { addAllToQueue, playAllNext } from "$lib/player/player.svelte";
 	import { trackFromSongRow } from "$lib/player/types";
-	import { SongCategoryMap, SongTypeReverseMap } from "$lib/utils/amq";
 	import type { PageData } from "./$types";
 	import { SearchParamsSchema } from "./schema";
 
@@ -34,11 +33,6 @@
 		return r.artistName ?? r.groupName ?? null;
 	}
 
-	// Helper to map song type number back to string for UI display
-	function getSongTypeLabel(type: number): string {
-		return SongTypeReverseMap[type] || `Type ${type}`;
-	}
-
 	const tracksFromResults = $derived.by(() =>
 		data.songRows
 			.map((r) =>
diff --git a/src/routes/songs/schema.ts b/src/routes/songs/schema.ts
index 637d0f6..068b501 100644
--- a/src/routes/songs/schema.ts
+++ b/src/routes/songs/schema.ts
@@ -4,6 +4,6 @@ export const SearchParamsSchema = z.object({
 	song: z.string().optional().default(""),
 	artist: z.string().optional().default(""),
 	anime: z.string().optional().default(""),
-	gpm: z.int().optional().default(0),
-	gpx: z.int().optional().default(100),
+	gpm: z.coerce.number().int().optional().default(0),
+	gpx: z.coerce.number().int().optional().default(100),
 });