diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/AppUser.java b/backend/src/main/java/org/raddatz/familienarchiv/model/AppUser.java
index 99531d39..254b3c8f 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/model/AppUser.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/model/AppUser.java
@@ -8,6 +8,7 @@ import org.raddatz.familienarchiv.dto.CreateUserRequest;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import java.time.LocalDateTime;
 import java.util.HashSet;
@@ -24,9 +25,11 @@ public class AppUser {
 
     @Id
     @GeneratedValue(strategy = GenerationType.UUID)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     private UUID id;
 
     @Column(unique = true, nullable = false)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     private String username;
 
     @Column(nullable = false)
@@ -36,15 +39,18 @@ public class AppUser {
     private String email;
 
     @Builder.Default
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     private boolean enabled = true; // Um User zu sperren ohne sie zu löschen
 
     // Ein User kann in mehreren Gruppen sein
     @ManyToMany(fetch = FetchType.EAGER)
     @JoinTable(name = "users_groups", joinColumns = @JoinColumn(name = "user_id"), inverseJoinColumns = @JoinColumn(name = "group_id"))
     @Builder.Default
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     private Set<UserGroup> groups = new HashSet<>();
 
     @CreationTimestamp
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createdAt;
 
     public boolean hasPermission(String permission) {
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/Document.java b/backend/src/main/java/org/raddatz/familienarchiv/model/Document.java
index 28099a43..7c0abb37 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/model/Document.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/model/Document.java
@@ -6,6 +6,7 @@ import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -23,9 +24,11 @@ public class Document {
 
     @Id
     @GeneratedValue(strategy = GenerationType.UUID)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     private UUID id;
 
     @Column(nullable = false)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     private String title;
 
     // Der Dateiname im S3 (oder Pfad)
@@ -38,11 +41,13 @@ public class Document {
 
     // Originaler Dateiname beim Upload (z.B. "Brief_Oma_1940.pdf")
     @Column(name = "original_filename", nullable = false)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     private String originalFilename;
 
     // Der Status hilft uns beim Excel-Import Workflow
     @Enumerated(EnumType.STRING)
     @Column(nullable = false)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     private DocumentStatus status;
 
     // Metadaten aus dem Brief
@@ -70,9 +75,11 @@ public class Document {
 
     @CreationTimestamp
     @Column(updatable = false)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createdAt;
 
     @UpdateTimestamp
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime updatedAt;
 
     @ManyToMany(fetch = FetchType.EAGER)
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/Person.java b/backend/src/main/java/org/raddatz/familienarchiv/model/Person.java
index 426265de..aa704a29 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/model/Person.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/model/Person.java
@@ -1,5 +1,6 @@
 package org.raddatz.familienarchiv.model;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.*;
 import lombok.*;
 
@@ -14,12 +15,15 @@ public class Person {
 
     @Id
     @GeneratedValue(strategy = GenerationType.UUID)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     private UUID id;
 
     @Column(nullable = false)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     private String firstName;
 
     @Column(nullable = false)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     private String lastName;
 
     // Optional: Aliasse für die Suche (z.B. "Opa Hans")
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/Tag.java b/backend/src/main/java/org/raddatz/familienarchiv/model/Tag.java
index dc5c1782..5063ffa3 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/model/Tag.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/model/Tag.java
@@ -2,6 +2,7 @@ package org.raddatz.familienarchiv.model;
 
 import java.util.UUID;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.*;
 import lombok.*;
 
@@ -13,8 +14,10 @@ import lombok.*;
 public class Tag {
     @Id
     @GeneratedValue(strategy = GenerationType.UUID)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     private UUID id;
 
     @Column(unique = true, nullable = false)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     private String name;
 }
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/UserGroup.java b/backend/src/main/java/org/raddatz/familienarchiv/model/UserGroup.java
index 872cba2c..7b68087b 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/model/UserGroup.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/model/UserGroup.java
@@ -1,5 +1,6 @@
 package org.raddatz.familienarchiv.model;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.*;
 import lombok.*;
 
@@ -17,9 +18,11 @@ public class UserGroup {
 
     @Id
     @GeneratedValue(strategy = GenerationType.UUID)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     private UUID id;
 
     @Column(unique = true, nullable = false)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     private String name; // z.B. "Admins", "Familie Müller"
 
     // Wir speichern Rechte als einfache Strings (z.B. "READ_ALL", "WRITE_DOCUMENTS")
@@ -27,5 +30,6 @@ public class UserGroup {
     @CollectionTable(name = "group_permissions", joinColumns = @JoinColumn(name = "group_id"))
     @Column(name = "permission")
     @Builder.Default
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     private Set<String> permissions = new HashSet<>();
 }
diff --git a/frontend/src/lib/components/TagInput.svelte b/frontend/src/lib/components/TagInput.svelte
index f9f08b37..63350213 100644
--- a/frontend/src/lib/components/TagInput.svelte
+++ b/frontend/src/lib/components/TagInput.svelte
@@ -80,6 +80,7 @@
 				<button
 					type="button"
 					on:click={() => removeTag(i)}
+					aria-label="Schlagwort entfernen"
 					class="text-brand-navy/50 hover:text-red-500 focus:outline-none"
 				>
 					<svg class="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24"
@@ -117,12 +118,15 @@
 					class="absolute left-0 top-full mt-1 w-full bg-white border border-gray-200 rounded shadow-lg z-50 max-h-48 overflow-y-auto"
 				>
 					{#each suggestions as suggestion, i}
-						<!-- svelte-ignore a11y-click-events-have-key-events -->
 						<li
+							role="option"
+							aria-selected={i === activeIndex}
+							tabindex="0"
 							class="px-3 py-2 text-sm cursor-pointer hover:bg-brand-sand/20 {i === activeIndex
 								? 'bg-brand-sand/20 text-brand-navy font-bold'
 								: 'text-gray-700'}"
 							on:click={() => addTag(suggestion)}
+							on:keydown={(e) => e.key === 'Enter' && addTag(suggestion)}
 						>
 							{suggestion}
 						</li>
diff --git a/frontend/src/lib/generated/api.ts b/frontend/src/lib/generated/api.ts
index 8f177766..37cd968f 100644
--- a/frontend/src/lib/generated/api.ts
+++ b/frontend/src/lib/generated/api.ts
@@ -282,14 +282,14 @@ export interface components {
     schemas: {
         Tag: {
             /** Format: uuid */
-            id?: string;
-            name?: string;
+            id: string;
+            name: string;
         };
         Person: {
             /** Format: uuid */
-            id?: string;
-            firstName?: string;
-            lastName?: string;
+            id: string;
+            firstName: string;
+            lastName: string;
             alias?: string;
         };
         DocumentUpdateDTO: {
@@ -307,13 +307,13 @@ export interface components {
         };
         Document: {
             /** Format: uuid */
-            id?: string;
-            title?: string;
+            id: string;
+            title: string;
             filePath?: string;
             contentType?: string;
-            originalFilename?: string;
+            originalFilename: string;
             /** @enum {string} */
-            status?: "PLACEHOLDER" | "UPLOADED" | "TRANSCRIBED" | "REVIEWED" | "ARCHIVED";
+            status: "PLACEHOLDER" | "UPLOADED" | "TRANSCRIBED" | "REVIEWED" | "ARCHIVED";
             /** Format: date */
             documentDate?: string;
             location?: string;
@@ -323,9 +323,9 @@ export interface components {
             transcription?: string;
             summary?: string;
             /** Format: date-time */
-            createdAt?: string;
+            createdAt: string;
             /** Format: date-time */
-            updatedAt?: string;
+            updatedAt: string;
             receivers?: components["schemas"]["Person"][];
             sender?: components["schemas"]["Person"];
             tags?: components["schemas"]["Tag"][];
@@ -338,20 +338,20 @@ export interface components {
         };
         AppUser: {
             /** Format: uuid */
-            id?: string;
-            username?: string;
+            id: string;
+            username: string;
             password?: string;
             email?: string;
-            enabled?: boolean;
-            groups?: components["schemas"]["UserGroup"][];
+            enabled: boolean;
+            groups: components["schemas"]["UserGroup"][];
             /** Format: date-time */
-            createdAt?: string;
+            createdAt: string;
         };
         UserGroup: {
             /** Format: uuid */
-            id?: string;
-            name?: string;
-            permissions?: string[];
+            id: string;
+            name: string;
+            permissions: string[];
         };
         GroupDTO: {
             name?: string;
@@ -738,7 +738,7 @@ export interface operations {
                     [name: string]: unknown;
                 };
                 content: {
-                    "*/*": string[];
+                    "*/*": components["schemas"]["Tag"][];
                 };
             };
         };
diff --git a/frontend/src/routes/+page.server.ts b/frontend/src/routes/+page.server.ts
index 2281ef02..991fbbb9 100644
--- a/frontend/src/routes/+page.server.ts
+++ b/frontend/src/routes/+page.server.ts
@@ -44,7 +44,8 @@ export async function load({ url, fetch }) {
                 senderName: senderObj ? `${senderObj.firstName} ${senderObj.lastName}` : '',
                 receiverName: receiverObj ? `${receiverObj.firstName} ${receiverObj.lastName}` : ''
             },
-            filters: { q, from, to, senderId, receiverId, tags }
+            filters: { q, from, to, senderId, receiverId, tags },
+            error: null as string | null
         };
     } catch (e) {
         if ((e as { status?: number }).status) throw e;
@@ -52,7 +53,8 @@ export async function load({ url, fetch }) {
         return {
             documents: [],
             initialValues: { senderName: '', receiverName: '' },
-            filters: { q, from, to, senderId, receiverId, tags }
+            filters: { q, from, to, senderId, receiverId, tags },
+            error: 'Daten konnten nicht geladen werden.' as string | null
         };
     }
 }
diff --git a/frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte
index 95b0f8d5..e12e6610 100644
--- a/frontend/src/routes/+page.svelte
+++ b/frontend/src/routes/+page.svelte
@@ -143,9 +143,7 @@
 			>
 				<!-- Tag Filter -->
 				<div class="md:col-span-12">
-					<label class="block text-xs font-bold uppercase tracking-widest text-gray-500 mb-2"
-						>Schlagworte</label
-					>
+					<p class="block text-xs font-bold uppercase tracking-widest text-gray-500 mb-2">Schlagworte</p>
 					<TagInput bind:tags={tagNames} allowCreation={false} on:change={triggerSearch} />
 				</div>
 
diff --git a/frontend/src/routes/admin/+page.server.ts b/frontend/src/routes/admin/+page.server.ts
index b7d0aa60..ce47149c 100644
--- a/frontend/src/routes/admin/+page.server.ts
+++ b/frontend/src/routes/admin/+page.server.ts
@@ -4,7 +4,7 @@ import { getErrorMessage } from '$lib/errors';
 
 export async function load({ fetch, locals }) {
     const user = locals.user;
-    const hasAdmin = user?.groups.some((g: { permissions: string[] }) => g.permissions.includes('ADMIN'));
+    const hasAdmin = user?.groups?.some((g: { permissions: string[] }) => g.permissions.includes('ADMIN'));
     if (!hasAdmin) throw error(403, getErrorMessage('FORBIDDEN'));
 
     const api = createApiClient(fetch);
@@ -27,17 +27,17 @@ export const actions = {
         const data = await request.formData();
         const api = createApiClient(fetch);
 
-        const { error: apiError, response } = await api.POST('/api/users', {
+        const result = await api.POST('/api/users', {
             body: {
-                username: data.get('username'),
-                initialPassword: data.get('password'),
-                groupIds: data.getAll('groupIds')
+                username: data.get('username') as string,
+                initialPassword: data.get('password') as string,
+                groupIds: data.getAll('groupIds') as string[]
             }
         });
 
-        if (apiError) {
-            const code = (apiError as { code?: string })?.code;
-            return fail(response.status, { success: false, message: getErrorMessage(code) });
+        if (!result.response.ok) {
+            const code = (result.error as unknown as { code?: string })?.code;
+            return fail(result.response.status, { success: false, message: getErrorMessage(code) });
         }
         return { success: true };
     },
@@ -47,13 +47,13 @@ export const actions = {
         const id = data.get('id') as string;
         const api = createApiClient(fetch);
 
-        const { error: apiError, response } = await api.DELETE('/api/users/{id}', {
+        const result = await api.DELETE('/api/users/{id}', {
             params: { path: { id } }
         });
 
-        if (apiError) {
-            const code = (apiError as { code?: string })?.code;
-            return fail(response.status, { success: false, message: getErrorMessage(code) });
+        if (!result.response.ok) {
+            const code = (result.error as unknown as { code?: string })?.code;
+            return fail(result.response.status, { success: false, message: getErrorMessage(code) });
         }
         return { success: true };
     },
@@ -63,14 +63,14 @@ export const actions = {
         const id = data.get('id') as string;
         const api = createApiClient(fetch);
 
-        const { error: apiError, response } = await api.PUT('/api/tags/{id}', {
+        const result = await api.PUT('/api/tags/{id}', {
             params: { path: { id } },
-            body: { name: data.get('name') }
+            body: { name: data.get('name') as string }
         });
 
-        if (apiError) {
-            const code = (apiError as { code?: string })?.code;
-            return fail(response.status, { success: false, message: getErrorMessage(code) });
+        if (!result.response.ok) {
+            const code = (result.error as unknown as { code?: string })?.code;
+            return fail(result.response.status, { success: false, message: getErrorMessage(code) });
         }
         return { success: true };
     },
@@ -80,13 +80,13 @@ export const actions = {
         const id = data.get('id') as string;
         const api = createApiClient(fetch);
 
-        const { error: apiError, response } = await api.DELETE('/api/tags/{id}', {
+        const result = await api.DELETE('/api/tags/{id}', {
             params: { path: { id } }
         });
 
-        if (apiError) {
-            const code = (apiError as { code?: string })?.code;
-            return fail(response.status, { success: false, message: getErrorMessage(code) });
+        if (!result.response.ok) {
+            const code = (result.error as unknown as { code?: string })?.code;
+            return fail(result.response.status, { success: false, message: getErrorMessage(code) });
         }
         return { success: true };
     },
@@ -95,16 +95,16 @@ export const actions = {
         const data = await request.formData();
         const api = createApiClient(fetch);
 
-        const { error: apiError, response } = await api.POST('/api/groups', {
+        const result = await api.POST('/api/groups', {
             body: {
-                name: data.get('name'),
-                permissions: data.getAll('permissions')
+                name: data.get('name') as string,
+                permissions: data.getAll('permissions') as string[]
             }
         });
 
-        if (apiError) {
-            const code = (apiError as { code?: string })?.code;
-            return fail(response.status, { success: false, message: getErrorMessage(code) });
+        if (!result.response.ok) {
+            const code = (result.error as unknown as { code?: string })?.code;
+            return fail(result.response.status, { success: false, message: getErrorMessage(code) });
         }
         return { success: true };
     },
@@ -114,17 +114,17 @@ export const actions = {
         const id = data.get('id') as string;
         const api = createApiClient(fetch);
 
-        const { error: apiError, response } = await api.PATCH('/api/groups/{id}', {
+        const result = await api.PATCH('/api/groups/{id}', {
             params: { path: { id } },
             body: {
-                name: data.get('name'),
-                permissions: data.getAll('permissions')
+                name: data.get('name') as string,
+                permissions: data.getAll('permissions') as string[]
             }
         });
 
-        if (apiError) {
-            const code = (apiError as { code?: string })?.code;
-            return fail(response.status, { success: false, message: getErrorMessage(code) });
+        if (!result.response.ok) {
+            const code = (result.error as unknown as { code?: string })?.code;
+            return fail(result.response.status, { success: false, message: getErrorMessage(code) });
         }
         return { success: true };
     },
@@ -134,13 +134,13 @@ export const actions = {
         const id = data.get('id') as string;
         const api = createApiClient(fetch);
 
-        const { error: apiError, response } = await api.DELETE('/api/groups/{id}', {
+        const result = await api.DELETE('/api/groups/{id}', {
             params: { path: { id } }
         });
 
-        if (apiError) {
-            const code = (apiError as { code?: string })?.code;
-            return fail(response.status, { success: false, message: getErrorMessage(code) });
+        if (!result.response.ok) {
+            const code = (result.error as unknown as { code?: string })?.code;
+            return fail(result.response.status, { success: false, message: getErrorMessage(code) });
         }
         return { success: true };
     }
diff --git a/frontend/src/routes/admin/+page.svelte b/frontend/src/routes/admin/+page.svelte
index 9aad048d..1405421d 100644
--- a/frontend/src/routes/admin/+page.svelte
+++ b/frontend/src/routes/admin/+page.svelte
@@ -319,9 +319,8 @@
 									name="name"
 									bind:value={editingTagName}
 									class="flex-1 border-brand-mint ring-1 ring-brand-mint rounded px-2 py-1 text-sm"
-									autofocus
 								/>
-								<button class="text-green-600 hover:text-green-800"
+								<button aria-label="Speichern" class="text-green-600 hover:text-green-800"
 									><svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"
 										><path
 											stroke-linecap="round"
@@ -334,7 +333,8 @@
 								<button
 									type="button"
 									on:click={cancelEditTag}
-									class="text-gray-400 hover:text-gray-600"
+									aria-label="Abbrechen"
+								class="text-gray-400 hover:text-gray-600"
 									><svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"
 										><path
 											stroke-linecap="round"
@@ -354,6 +354,7 @@
 							>
 								<button
 									on:click={() => startEditTag(tag)}
+									aria-label="Schlagwort bearbeiten"
 									class="p-1 text-gray-400 hover:text-brand-navy"
 								>
 									<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"
@@ -386,7 +387,7 @@
 									class="inline"
 								>
 									<input type="hidden" name="id" value={tag.id} />
-									<button class="p-1 text-gray-400 hover:text-red-600">
+									<button aria-label="Schlagwort löschen" class="p-1 text-gray-400 hover:text-red-600">
 										<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"
 											><path
 												stroke-linecap="round"
@@ -473,7 +474,7 @@
 
 										<!-- Actions -->
 										<div class="flex gap-2 self-start sm:self-center">
-											<button type="submit" class="text-green-600 hover:text-green-800 p-1">
+											<button type="submit" aria-label="Speichern" class="text-green-600 hover:text-green-800 p-1">
 												<svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24"
 													><path
 														stroke-linecap="round"
@@ -486,7 +487,8 @@
 											<button
 												type="button"
 												on:click={cancelEditGroup}
-												class="text-gray-400 hover:text-red-500 p-1"
+												aria-label="Abbrechen"
+											class="text-gray-400 hover:text-red-500 p-1"
 											>
 												<svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24"
 													><path
diff --git a/frontend/src/routes/conversations/+page.server.ts b/frontend/src/routes/conversations/+page.server.ts
index 0c8797dc..93ba78fd 100644
--- a/frontend/src/routes/conversations/+page.server.ts
+++ b/frontend/src/routes/conversations/+page.server.ts
@@ -1,3 +1,4 @@
+import type { components } from '$lib/generated/api';
 import { createApiClient } from '$lib/api.server';
 
 export async function load({ url, fetch }) {
@@ -9,7 +10,7 @@ export async function load({ url, fetch }) {
 
     const api = createApiClient(fetch);
 
-    let documents: unknown[] = [];
+    let documents: components['schemas']['Document'][] = [];
     let senderName = '';
     let receiverName = '';
 
diff --git a/frontend/src/routes/conversations/+page.svelte b/frontend/src/routes/conversations/+page.svelte
index 3b437b79..685df600 100644
--- a/frontend/src/routes/conversations/+page.svelte
+++ b/frontend/src/routes/conversations/+page.svelte
@@ -5,7 +5,7 @@
     export let data;
 
     // Data & State
-    let documents = [];
+    let documents: typeof data.documents = [];
     let initialValues = { senderName: '', receiverName: '' };
 
     // Filter State
diff --git a/frontend/src/routes/documents/[id]/+page.server.ts b/frontend/src/routes/documents/[id]/+page.server.ts
index ae6f09f1..8e0830c2 100644
--- a/frontend/src/routes/documents/[id]/+page.server.ts
+++ b/frontend/src/routes/documents/[id]/+page.server.ts
@@ -6,16 +6,14 @@ export async function load({ params, fetch }) {
     const { id } = params;
     const api = createApiClient(fetch);
 
-    const { data, error: apiError, response } = await api.GET('/api/documents/{id}', {
-        params: { path: { id } }
-    });
+    const result = await api.GET('/api/documents/{id}', { params: { path: { id } } });
 
-    if (response.status === 401) throw redirect(302, '/login');
+    if (result.response.status === 401) throw redirect(302, '/login');
 
-    if (apiError) {
-        const code = (apiError as { code?: string })?.code;
-        throw error(response.status, getErrorMessage(code));
+    if (!result.response.ok) {
+        const code = (result.error as unknown as { code?: string })?.code;
+        throw error(result.response.status, getErrorMessage(code));
     }
 
-    return { document: data };
+    return { document: result.data! };
 }
diff --git a/frontend/src/routes/documents/[id]/+page.svelte b/frontend/src/routes/documents/[id]/+page.svelte
index b91bb794..111af980 100644
--- a/frontend/src/routes/documents/[id]/+page.svelte
+++ b/frontend/src/routes/documents/[id]/+page.svelte
@@ -12,7 +12,7 @@
         loadFile(doc.id);
     }
 
-    async function loadFile(id) {
+    async function loadFile(id: string) {
         isLoading = true;
         error = '';
         fileUrl = ''; // Reset previous URL
@@ -430,7 +430,6 @@
 					src={fileUrl}
 					title="Document Preview"
 					class="w-full h-full border-none bg-white"
-					type="application/pdf"
 				></iframe>
 			{:else if fileUrl}
 				<!-- Image with Blob URL -->
diff --git a/frontend/src/routes/documents/[id]/edit/+page.server.ts b/frontend/src/routes/documents/[id]/edit/+page.server.ts
index acf3935d..24f5af7f 100644
--- a/frontend/src/routes/documents/[id]/edit/+page.server.ts
+++ b/frontend/src/routes/documents/[id]/edit/+page.server.ts
@@ -12,16 +12,16 @@ export async function load({ params, fetch }) {
         api.GET('/api/persons')
     ]);
 
-    if (docResult.error) {
-        const code = (docResult.error as { code?: string })?.code;
+    if (!docResult.response.ok) {
+        const code = (docResult.error as unknown as { code?: string })?.code;
         throw error(docResult.response.status, getErrorMessage(code));
     }
-    if (personsResult.error) {
+    if (!personsResult.response.ok) {
         throw error(personsResult.response.status, getErrorMessage('INTERNAL_ERROR'));
     }
 
     return {
-        document: docResult.data,
+        document: docResult.data!,
         persons: personsResult.data
     };
 }
diff --git a/frontend/src/routes/persons/[id]/+page.server.ts b/frontend/src/routes/persons/[id]/+page.server.ts
index 378c371f..daef64f9 100644
--- a/frontend/src/routes/persons/[id]/+page.server.ts
+++ b/frontend/src/routes/persons/[id]/+page.server.ts
@@ -11,13 +11,13 @@ export async function load({ params, fetch }) {
         api.GET('/api/persons/{id}/documents', { params: { path: { id } } })
     ]);
 
-    if (personResult.error) {
-        const code = (personResult.error as { code?: string })?.code;
+    if (!personResult.response.ok) {
+        const code = (personResult.error as unknown as { code?: string })?.code;
         throw error(personResult.response.status, getErrorMessage(code));
     }
 
     return {
-        person: personResult.data,
+        person: personResult.data!,
         documents: docsResult.data ?? []
     };
 }