diff --git a/src/routes/(app)/database/characters/[id]/edit/+page.svelte b/src/routes/(app)/database/characters/[id]/edit/+page.svelte
index eaf05826..ed792eab 100644
--- a/src/routes/(app)/database/characters/[id]/edit/+page.svelte
+++ b/src/routes/(app)/database/characters/[id]/edit/+page.svelte
@@ -74,7 +74,7 @@
 	$effect(() => {
 		if (character) {
 			editData = {
-				name: character.name || '',
+				name: character.name?.en || '',
 				granblueId: character.granblueId || '',
 				characterId: character.characterId ?? null,
 				rarity: character.rarity || 1,
diff --git a/src/routes/(app)/database/gw-events/[id]/+page.svelte b/src/routes/(app)/database/gw-events/[id]/+page.svelte
index 124de625..c459ee4e 100644
--- a/src/routes/(app)/database/gw-events/[id]/+page.svelte
+++ b/src/routes/(app)/database/gw-events/[id]/+page.svelte
@@ -23,7 +23,7 @@
 	// Query for event data
 	const eventQuery = createQuery(() => ({
 		queryKey: ['gw', 'events', eventId],
-		queryFn: () => gwAdapter.getEvent(eventId),
+		queryFn: () => gwAdapter.getEvent(eventId ?? ''),
 		enabled: !!eventId
 	}))
 
diff --git a/src/routes/(app)/database/gw-events/[id]/edit/+page.svelte b/src/routes/(app)/database/gw-events/[id]/edit/+page.svelte
index 960f8978..27d9b8bc 100644
--- a/src/routes/(app)/database/gw-events/[id]/edit/+page.svelte
+++ b/src/routes/(app)/database/gw-events/[id]/edit/+page.svelte
@@ -25,7 +25,7 @@
 	// Query for event data
 	const eventQuery = createQuery(() => ({
 		queryKey: ['gw', 'events', eventId],
-		queryFn: () => gwAdapter.getEvent(eventId),
+		queryFn: () => gwAdapter.getEvent(eventId ?? ''),
 		enabled: !!eventId
 	}))
 
diff --git a/src/routes/(app)/database/summons/[id]/edit/+page.svelte b/src/routes/(app)/database/summons/[id]/edit/+page.svelte
index 32ade2bc..14a1abc7 100644
--- a/src/routes/(app)/database/summons/[id]/edit/+page.svelte
+++ b/src/routes/(app)/database/summons/[id]/edit/+page.svelte
@@ -89,7 +89,7 @@
 				granblueId: summon.granblueId || '',
 				rarity: summon.rarity || 3,
 				element: summon.element || 0,
-				series: summon.series || '',
+				series: summon.series?.toString() ?? '',
 				minHp: summon.hp?.minHp || 0,
 				maxHp: summon.hp?.maxHp || 0,
 				maxHpFlb: summon.hp?.maxHpFlb || 0,
diff --git a/src/routes/(app)/database/weapons/[id]/edit/+page.svelte b/src/routes/(app)/database/weapons/[id]/edit/+page.svelte
index aaf1306f..847d9fa5 100644
--- a/src/routes/(app)/database/weapons/[id]/edit/+page.svelte
+++ b/src/routes/(app)/database/weapons/[id]/edit/+page.svelte
@@ -111,7 +111,7 @@
 				ulb: weapon.uncap?.ulb || false,
 				transcendence: weapon.uncap?.transcendence || false,
 				extra: weapon.extra || false,
-				limit: weapon.limit || false,
+				limit: Boolean(weapon.limit),
 				ax: weapon.ax || false,
 				promotions: weapon.promotions || [],
 				releaseDate: weapon.releaseDate || '',
@@ -124,7 +124,7 @@
 				kamigame: weapon.kamigame || '',
 				nicknamesEn: weapon.nicknames?.en || [],
 				nicknamesJp: weapon.nicknames?.ja || [],
-				recruits: weapon.recruits || ''
+				recruits: typeof weapon.recruits === 'string' ? weapon.recruits : (weapon.recruits?.granblueId ?? '')
 			}
 		}
 	})