diff --git a/FictionArchive.Service.NovelService/GraphQL/Query.cs b/FictionArchive.Service.NovelService/GraphQL/Query.cs
index 2c572bb..9b2930c 100644
--- a/FictionArchive.Service.NovelService/GraphQL/Query.cs
+++ b/FictionArchive.Service.NovelService/GraphQL/Query.cs
@@ -153,12 +153,12 @@ public class Query
     public IQueryable<ChapterReaderDto> GetChapter(
         NovelServiceDbContext dbContext,
         uint novelId,
-        uint volumeId,
+        uint volumeOrder,
         uint chapterOrder,
         Language preferredLanguage = Language.En)
     {
         return dbContext.Chapters
-            .Where(c => c.Volume.Novel.Id == novelId && c.Volume.Id == volumeId && c.Order == chapterOrder)
+            .Where(c => c.Volume.Novel.Id == novelId && c.Volume.Order == volumeOrder && c.Order == chapterOrder)
             .Select(chapter => new ChapterReaderDto
             {
                 Id = chapter.Id,
@@ -210,16 +210,16 @@ public class Query
                 TotalChaptersInVolume = chapter.Volume.Chapters.Count,
 
                 // Previous chapter: first try same volume, then last chapter of previous volume
-                PrevChapterVolumeId = chapter.Volume.Chapters
+                PrevChapterVolumeOrder = chapter.Volume.Chapters
                     .Where(c => c.Order < chapterOrder)
                     .OrderByDescending(c => c.Order)
-                    .Select(c => (uint?)chapter.Volume.Id)
+                    .Select(c => (int?)chapter.Volume.Order)
                     .FirstOrDefault()
                     ?? chapter.Volume.Novel.Volumes
                         .Where(v => v.Order < chapter.Volume.Order)
                         .OrderByDescending(v => v.Order)
                         .SelectMany(v => v.Chapters.OrderByDescending(c => c.Order).Take(1))
-                        .Select(c => (uint?)c.Volume.Id)
+                        .Select(c => (int?)c.Volume.Order)
                         .FirstOrDefault(),
 
                 PrevChapterOrder = chapter.Volume.Chapters
@@ -235,16 +235,16 @@ public class Query
                         .FirstOrDefault(),
 
                 // Next chapter: first try same volume, then first chapter of next volume
-                NextChapterVolumeId = chapter.Volume.Chapters
+                NextChapterVolumeOrder = chapter.Volume.Chapters
                     .Where(c => c.Order > chapterOrder)
                     .OrderBy(c => c.Order)
-                    .Select(c => (uint?)chapter.Volume.Id)
+                    .Select(c => (int?)chapter.Volume.Order)
                     .FirstOrDefault()
                     ?? chapter.Volume.Novel.Volumes
                         .Where(v => v.Order > chapter.Volume.Order)
                         .OrderBy(v => v.Order)
                         .SelectMany(v => v.Chapters.OrderBy(c => c.Order).Take(1))
-                        .Select(c => (uint?)c.Volume.Id)
+                        .Select(c => (int?)c.Volume.Order)
                         .FirstOrDefault(),
 
                 NextChapterOrder = chapter.Volume.Chapters
diff --git a/FictionArchive.Service.NovelService/Models/DTOs/ChapterReaderDto.cs b/FictionArchive.Service.NovelService/Models/DTOs/ChapterReaderDto.cs
index e976bd9..ca20dee 100644
--- a/FictionArchive.Service.NovelService/Models/DTOs/ChapterReaderDto.cs
+++ b/FictionArchive.Service.NovelService/Models/DTOs/ChapterReaderDto.cs
@@ -19,9 +19,9 @@ public class ChapterReaderDto : BaseDto<uint>
     public int VolumeOrder { get; init; }
     public int TotalChaptersInVolume { get; init; }
 
-    // Cross-volume navigation (VolumeId + Order identify a chapter)
-    public uint? PrevChapterVolumeId { get; init; }
+    // Cross-volume navigation (VolumeOrder + ChapterOrder identify a chapter)
+    public int? PrevChapterVolumeOrder { get; init; }
     public uint? PrevChapterOrder { get; init; }
-    public uint? NextChapterVolumeId { get; init; }
+    public int? NextChapterVolumeOrder { get; init; }
     public uint? NextChapterOrder { get; init; }
 }
diff --git a/fictionarchive-web-astro/src/lib/components/ChapterNavigation.svelte b/fictionarchive-web-astro/src/lib/components/ChapterNavigation.svelte
index 088b8e6..6f547fc 100644
--- a/fictionarchive-web-astro/src/lib/components/ChapterNavigation.svelte
+++ b/fictionarchive-web-astro/src/lib/components/ChapterNavigation.svelte
@@ -6,31 +6,31 @@
 
 	interface Props {
 		novelId: string;
-		prevChapterVolumeId: number | null | undefined;
+		prevChapterVolumeOrder: number | null | undefined;
 		prevChapterOrder: number | null | undefined;
-		nextChapterVolumeId: number | null | undefined;
+		nextChapterVolumeOrder: number | null | undefined;
 		nextChapterOrder: number | null | undefined;
 		showKeyboardHints?: boolean;
 	}
 
 	let {
 		novelId,
-		prevChapterVolumeId,
+		prevChapterVolumeOrder,
 		prevChapterOrder,
-		nextChapterVolumeId,
+		nextChapterVolumeOrder,
 		nextChapterOrder,
 		showKeyboardHints = true
 	}: Props = $props();
 
-	const hasPrev = $derived(prevChapterOrder != null && prevChapterVolumeId != null);
-	const hasNext = $derived(nextChapterOrder != null && nextChapterVolumeId != null);
+	const hasPrev = $derived(prevChapterOrder != null && prevChapterVolumeOrder != null);
+	const hasNext = $derived(nextChapterOrder != null && nextChapterVolumeOrder != null);
 </script>
 
 <div class="flex flex-col gap-2">
 	<div class="flex items-center justify-between gap-4">
 		<Button
 			variant="outline"
-			href={hasPrev ? `/novels/${novelId}/volumes/${prevChapterVolumeId}/chapters/${prevChapterOrder}` : undefined}
+			href={hasPrev ? `/novels/${novelId}/volumes/${prevChapterVolumeOrder}/chapters/${prevChapterOrder}` : undefined}
 			disabled={!hasPrev}
 			class="gap-2"
 		>
@@ -45,7 +45,7 @@
 
 		<Button
 			variant="outline"
-			href={hasNext ? `/novels/${novelId}/volumes/${nextChapterVolumeId}/chapters/${nextChapterOrder}` : undefined}
+			href={hasNext ? `/novels/${novelId}/volumes/${nextChapterVolumeOrder}/chapters/${nextChapterOrder}` : undefined}
 			disabled={!hasNext}
 			class="gap-2"
 		>
diff --git a/fictionarchive-web-astro/src/lib/components/ChapterReaderPage.svelte b/fictionarchive-web-astro/src/lib/components/ChapterReaderPage.svelte
index bbf838f..977979e 100644
--- a/fictionarchive-web-astro/src/lib/components/ChapterReaderPage.svelte
+++ b/fictionarchive-web-astro/src/lib/components/ChapterReaderPage.svelte
@@ -16,11 +16,11 @@
 
 	interface Props {
 		novelId?: string;
-		volumeId?: string;
+		volumeOrder?: string;
 		chapterNumber?: string;
 	}
 
-	let { novelId, volumeId, chapterNumber }: Props = $props();
+	let { novelId, volumeOrder, chapterNumber }: Props = $props();
 
 	// State
 	let chapter: ChapterData | null = $state(null);
@@ -43,16 +43,16 @@
 			return;
 		}
 
-		if (event.key === 'ArrowLeft' && chapter?.prevChapterOrder != null && chapter?.prevChapterVolumeId != null) {
-			window.location.href = `/novels/${novelId}/volumes/${chapter.prevChapterVolumeId}/chapters/${chapter.prevChapterOrder}`;
-		} else if (event.key === 'ArrowRight' && chapter?.nextChapterOrder != null && chapter?.nextChapterVolumeId != null) {
-			window.location.href = `/novels/${novelId}/volumes/${chapter.nextChapterVolumeId}/chapters/${chapter.nextChapterOrder}`;
+		if (event.key === 'ArrowLeft' && chapter?.prevChapterOrder != null && chapter?.prevChapterVolumeOrder != null) {
+			window.location.href = `/novels/${novelId}/volumes/${chapter.prevChapterVolumeOrder}/chapters/${chapter.prevChapterOrder}`;
+		} else if (event.key === 'ArrowRight' && chapter?.nextChapterOrder != null && chapter?.nextChapterVolumeOrder != null) {
+			window.location.href = `/novels/${novelId}/volumes/${chapter.nextChapterVolumeOrder}/chapters/${chapter.nextChapterOrder}`;
 		}
 	}
 
 	async function fetchChapter() {
-		if (!novelId || !volumeId || !chapterNumber) {
-			error = 'Missing novel ID, volume ID, or chapter number';
+		if (!novelId || !volumeOrder || !chapterNumber) {
+			error = 'Missing novel ID, volume order, or chapter number';
 			fetching = false;
 			return;
 		}
@@ -64,7 +64,7 @@
 			const result = await client
 				.query(GetChapterDocument, {
 					novelId: parseInt(novelId, 10),
-					volumeId: parseInt(volumeId, 10),
+					volumeOrder: parseInt(volumeOrder, 10),
 					chapterOrder: parseInt(chapterNumber, 10)
 				})
 				.toPromise();
@@ -139,9 +139,9 @@
 		<!-- Navigation (top) -->
 		<ChapterNavigation
 			novelId={novelId ?? ''}
-			prevChapterVolumeId={chapter.prevChapterVolumeId}
+			prevChapterVolumeOrder={chapter.prevChapterVolumeOrder}
 			prevChapterOrder={chapter.prevChapterOrder}
-			nextChapterVolumeId={chapter.nextChapterVolumeId}
+			nextChapterVolumeOrder={chapter.nextChapterVolumeOrder}
 			nextChapterOrder={chapter.nextChapterOrder}
 		/>
 
@@ -173,9 +173,9 @@
 		<!-- Navigation (bottom) -->
 		<ChapterNavigation
 			novelId={novelId ?? ''}
-			prevChapterVolumeId={chapter.prevChapterVolumeId}
+			prevChapterVolumeOrder={chapter.prevChapterVolumeOrder}
 			prevChapterOrder={chapter.prevChapterOrder}
-			nextChapterVolumeId={chapter.nextChapterVolumeId}
+			nextChapterVolumeOrder={chapter.nextChapterVolumeOrder}
 			nextChapterOrder={chapter.nextChapterOrder}
 			showKeyboardHints={false}
 		/>
diff --git a/fictionarchive-web-astro/src/lib/components/NovelDetailPage.svelte b/fictionarchive-web-astro/src/lib/components/NovelDetailPage.svelte
index 783ac2b..63ab147 100644
--- a/fictionarchive-web-astro/src/lib/components/NovelDetailPage.svelte
+++ b/fictionarchive-web-astro/src/lib/components/NovelDetailPage.svelte
@@ -87,7 +87,7 @@
 	type GalleryImage = {
 		src: string;
 		alt: string;
-		volumeId?: number;
+		volumeOrder?: number;
 		chapterId?: number;
 		chapterOrder?: number;
 		chapterName?: string;
@@ -151,7 +151,7 @@
 			images.push({ src: coverSrc, alt: `${novel.name} cover`, isCover: true });
 		}
 
-		// Add chapter images (loop through volumes to preserve volumeId)
+		// Add chapter images (loop through volumes to preserve volumeOrder)
 		for (const volume of sortedVolumes) {
 			const volumeChapters = [...volume.chapters].sort((a, b) => a.order - b.order);
 			for (const chapter of volumeChapters) {
@@ -160,7 +160,7 @@
 						images.push({
 							src: img.newPath,
 							alt: `Image from ${chapter.name}`,
-							volumeId: volume.id,
+							volumeOrder: volume.order,
 							chapterId: chapter.id,
 							chapterOrder: chapter.order,
 							chapterName: chapter.name,
@@ -549,7 +549,7 @@
 								{#each singleVolumeChapters as chapter (chapter.id)}
 									{@const chapterDate = chapter.lastUpdatedTime ? new Date(chapter.lastUpdatedTime) : null}
 									<a
-										href="/novels/{novelId}/volumes/{sortedVolumes[0]?.id}/chapters/{chapter.order}"
+										href="/novels/{novelId}/volumes/{sortedVolumes[0]?.order}/chapters/{chapter.order}"
 										class="flex items-center justify-between px-3 py-2.5 hover:bg-muted/50 rounded-md transition-colors group"
 									>
 										<div class="flex items-center gap-3 min-w-0">
@@ -588,7 +588,7 @@
 													{#each volumeChapters as chapter (chapter.id)}
 														{@const chapterDate = chapter.lastUpdatedTime ? new Date(chapter.lastUpdatedTime) : null}
 														<a
-															href="/novels/{novelId}/volumes/{volume.id}/chapters/{chapter.order}"
+															href="/novels/{novelId}/volumes/{volume.order}/chapters/{chapter.order}"
 															class="flex items-center justify-between px-3 py-2.5 hover:bg-muted/50 rounded-md transition-colors group"
 														>
 															<div class="flex items-center gap-3 min-w-0">
@@ -707,9 +707,9 @@
 			/>
 
 			<!-- Chapter link (if not cover) -->
-			{#if !currentImage.isCover && currentImage.volumeId && currentImage.chapterOrder}
+			{#if !currentImage.isCover && currentImage.volumeOrder && currentImage.chapterOrder}
 				<a
-					href="/novels/{novelId}/volumes/{currentImage.volumeId}/chapters/{currentImage.chapterOrder}"
+					href="/novels/{novelId}/volumes/{currentImage.volumeOrder}/chapters/{currentImage.chapterOrder}"
 					class="text-white/80 hover:text-white text-sm inline-flex items-center gap-1 mt-3"
 				>
 					From: Ch. {currentImage.chapterOrder} - {currentImage.chapterName}
diff --git a/fictionarchive-web-astro/src/lib/graphql/__generated__/graphql.ts b/fictionarchive-web-astro/src/lib/graphql/__generated__/graphql.ts
index 0c98f41..a003e28 100644
--- a/fictionarchive-web-astro/src/lib/graphql/__generated__/graphql.ts
+++ b/fictionarchive-web-astro/src/lib/graphql/__generated__/graphql.ts
@@ -69,12 +69,12 @@ export type ChapterReaderDto = {
   lastUpdatedTime: Scalars['Instant']['output'];
   name: Scalars['String']['output'];
   nextChapterOrder: Maybe<Scalars['UnsignedInt']['output']>;
-  nextChapterVolumeId: Maybe<Scalars['UnsignedInt']['output']>;
+  nextChapterVolumeOrder: Maybe<Scalars['Int']['output']>;
   novelId: Scalars['UnsignedInt']['output'];
   novelName: Scalars['String']['output'];
   order: Scalars['UnsignedInt']['output'];
   prevChapterOrder: Maybe<Scalars['UnsignedInt']['output']>;
-  prevChapterVolumeId: Maybe<Scalars['UnsignedInt']['output']>;
+  prevChapterVolumeOrder: Maybe<Scalars['Int']['output']>;
   revision: Scalars['UnsignedInt']['output'];
   totalChaptersInVolume: Scalars['Int']['output'];
   url: Maybe<Scalars['String']['output']>;
@@ -484,7 +484,7 @@ export type QueryChapterArgs = {
   chapterOrder: Scalars['UnsignedInt']['input'];
   novelId: Scalars['UnsignedInt']['input'];
   preferredLanguage?: Language;
-  volumeId: Scalars['UnsignedInt']['input'];
+  volumeOrder: Scalars['UnsignedInt']['input'];
 };
 
 
@@ -809,12 +809,12 @@ export type InviteUserMutation = { inviteUser: { userDto: { id: any, username: s
 
 export type GetChapterQueryVariables = Exact<{
   novelId: Scalars['UnsignedInt']['input'];
-  volumeId: Scalars['UnsignedInt']['input'];
+  volumeOrder: Scalars['UnsignedInt']['input'];
   chapterOrder: Scalars['UnsignedInt']['input'];
 }>;
 
 
-export type GetChapterQuery = { chapter: { id: any, order: any, name: string, body: string, url: string | null, revision: any, createdTime: any, lastUpdatedTime: any, novelId: any, novelName: string, volumeId: any, volumeName: string, volumeOrder: number, totalChaptersInVolume: number, prevChapterVolumeId: any | null, prevChapterOrder: any | null, nextChapterVolumeId: any | null, nextChapterOrder: any | null, images: Array<{ id: any, newPath: string | null }> } | null };
+export type GetChapterQuery = { chapter: { id: any, order: any, name: string, body: string, url: string | null, revision: any, createdTime: any, lastUpdatedTime: any, novelId: any, novelName: string, volumeId: any, volumeName: string, volumeOrder: number, totalChaptersInVolume: number, prevChapterVolumeOrder: number | null, prevChapterOrder: any | null, nextChapterVolumeOrder: number | null, nextChapterOrder: any | null, images: Array<{ id: any, newPath: string | null }> } | null };
 
 export type NovelQueryVariables = Exact<{
   id: Scalars['UnsignedInt']['input'];
@@ -842,7 +842,7 @@ export type GetSettingsPageDataQuery = { currentUser: { id: any, username: strin
 export const DeleteNovelDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteNovel"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"DeleteNovelInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteNovel"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"boolean"}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Error"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"message"}}]}}]}}]}}]}}]} as unknown as DocumentNode<DeleteNovelMutation, DeleteNovelMutationVariables>;
 export const ImportNovelDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"ImportNovel"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ImportNovelInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"importNovel"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"novelUpdateRequestedEvent"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"novelUrl"}}]}}]}}]}}]} as unknown as DocumentNode<ImportNovelMutation, ImportNovelMutationVariables>;
 export const InviteUserDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InviteUser"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"InviteUserInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"inviteUser"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"userDto"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"username"}},{"kind":"Field","name":{"kind":"Name","value":"email"}}]}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"InvalidOperationError"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"message"}}]}}]}}]}}]}}]} as unknown as DocumentNode<InviteUserMutation, InviteUserMutationVariables>;
-export const GetChapterDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetChapter"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"novelId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UnsignedInt"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"volumeId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UnsignedInt"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"chapterOrder"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UnsignedInt"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"chapter"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"novelId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"novelId"}}},{"kind":"Argument","name":{"kind":"Name","value":"volumeId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"volumeId"}}},{"kind":"Argument","name":{"kind":"Name","value":"chapterOrder"},"value":{"kind":"Variable","name":{"kind":"Name","value":"chapterOrder"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"order"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"body"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"revision"}},{"kind":"Field","name":{"kind":"Name","value":"createdTime"}},{"kind":"Field","name":{"kind":"Name","value":"lastUpdatedTime"}},{"kind":"Field","name":{"kind":"Name","value":"images"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"newPath"}}]}},{"kind":"Field","name":{"kind":"Name","value":"novelId"}},{"kind":"Field","name":{"kind":"Name","value":"novelName"}},{"kind":"Field","name":{"kind":"Name","value":"volumeId"}},{"kind":"Field","name":{"kind":"Name","value":"volumeName"}},{"kind":"Field","name":{"kind":"Name","value":"volumeOrder"}},{"kind":"Field","name":{"kind":"Name","value":"totalChaptersInVolume"}},{"kind":"Field","name":{"kind":"Name","value":"prevChapterVolumeId"}},{"kind":"Field","name":{"kind":"Name","value":"prevChapterOrder"}},{"kind":"Field","name":{"kind":"Name","value":"nextChapterVolumeId"}},{"kind":"Field","name":{"kind":"Name","value":"nextChapterOrder"}}]}}]}}]} as unknown as DocumentNode<GetChapterQuery, GetChapterQueryVariables>;
+export const GetChapterDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetChapter"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"novelId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UnsignedInt"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"volumeOrder"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UnsignedInt"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"chapterOrder"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UnsignedInt"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"chapter"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"novelId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"novelId"}}},{"kind":"Argument","name":{"kind":"Name","value":"volumeOrder"},"value":{"kind":"Variable","name":{"kind":"Name","value":"volumeOrder"}}},{"kind":"Argument","name":{"kind":"Name","value":"chapterOrder"},"value":{"kind":"Variable","name":{"kind":"Name","value":"chapterOrder"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"order"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"body"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"revision"}},{"kind":"Field","name":{"kind":"Name","value":"createdTime"}},{"kind":"Field","name":{"kind":"Name","value":"lastUpdatedTime"}},{"kind":"Field","name":{"kind":"Name","value":"images"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"newPath"}}]}},{"kind":"Field","name":{"kind":"Name","value":"novelId"}},{"kind":"Field","name":{"kind":"Name","value":"novelName"}},{"kind":"Field","name":{"kind":"Name","value":"volumeId"}},{"kind":"Field","name":{"kind":"Name","value":"volumeName"}},{"kind":"Field","name":{"kind":"Name","value":"volumeOrder"}},{"kind":"Field","name":{"kind":"Name","value":"totalChaptersInVolume"}},{"kind":"Field","name":{"kind":"Name","value":"prevChapterVolumeOrder"}},{"kind":"Field","name":{"kind":"Name","value":"prevChapterOrder"}},{"kind":"Field","name":{"kind":"Name","value":"nextChapterVolumeOrder"}},{"kind":"Field","name":{"kind":"Name","value":"nextChapterOrder"}}]}}]}}]} as unknown as DocumentNode<GetChapterQuery, GetChapterQueryVariables>;
 export const NovelDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"Novel"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UnsignedInt"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"novels"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"where"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"id"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"eq"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}]}}]}},{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"1"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"nodes"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"rawLanguage"}},{"kind":"Field","name":{"kind":"Name","value":"rawStatus"}},{"kind":"Field","name":{"kind":"Name","value":"statusOverride"}},{"kind":"Field","name":{"kind":"Name","value":"externalId"}},{"kind":"Field","name":{"kind":"Name","value":"createdTime"}},{"kind":"Field","name":{"kind":"Name","value":"lastUpdatedTime"}},{"kind":"Field","name":{"kind":"Name","value":"author"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"externalUrl"}}]}},{"kind":"Field","name":{"kind":"Name","value":"source"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"key"}},{"kind":"Field","name":{"kind":"Name","value":"url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"coverImage"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"newPath"}}]}},{"kind":"Field","name":{"kind":"Name","value":"tags"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"key"}},{"kind":"Field","name":{"kind":"Name","value":"displayName"}},{"kind":"Field","name":{"kind":"Name","value":"tagType"}}]}},{"kind":"Field","name":{"kind":"Name","value":"volumes"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"order"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"createdTime"}},{"kind":"Field","name":{"kind":"Name","value":"lastUpdatedTime"}},{"kind":"Field","name":{"kind":"Name","value":"chapters"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"order"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"lastUpdatedTime"}},{"kind":"Field","name":{"kind":"Name","value":"images"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"newPath"}}]}}]}}]}}]}}]}}]}}]} as unknown as DocumentNode<NovelQuery, NovelQueryVariables>;
 export const NovelsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"Novels"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"first"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"after"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"where"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"NovelDtoFilterInput"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"order"}},"type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"NovelDtoSortInput"}}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"novels"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"Variable","name":{"kind":"Name","value":"first"}}},{"kind":"Argument","name":{"kind":"Name","value":"after"},"value":{"kind":"Variable","name":{"kind":"Name","value":"after"}}},{"kind":"Argument","name":{"kind":"Name","value":"where"},"value":{"kind":"Variable","name":{"kind":"Name","value":"where"}}},{"kind":"Argument","name":{"kind":"Name","value":"order"},"value":{"kind":"Variable","name":{"kind":"Name","value":"order"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"edges"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"cursor"}},{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"coverImage"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"newPath"}}]}},{"kind":"Field","name":{"kind":"Name","value":"rawStatus"}},{"kind":"Field","name":{"kind":"Name","value":"lastUpdatedTime"}},{"kind":"Field","name":{"kind":"Name","value":"volumes"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"order"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"chapters"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"order"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"tags"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"key"}},{"kind":"Field","name":{"kind":"Name","value":"displayName"}},{"kind":"Field","name":{"kind":"Name","value":"tagType"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"pageInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"hasNextPage"}},{"kind":"Field","name":{"kind":"Name","value":"endCursor"}}]}}]}}]}}]} as unknown as DocumentNode<NovelsQuery, NovelsQueryVariables>;
 export const GetSettingsPageDataDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetSettingsPageData"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"currentUser"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"username"}},{"kind":"Field","name":{"kind":"Name","value":"availableInvites"}},{"kind":"Field","name":{"kind":"Name","value":"invitedUsers"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"username"}},{"kind":"Field","name":{"kind":"Name","value":"email"}}]}}]}}]}}]} as unknown as DocumentNode<GetSettingsPageDataQuery, GetSettingsPageDataQueryVariables>;
\ No newline at end of file
diff --git a/fictionarchive-web-astro/src/lib/graphql/queries/chapter.graphql b/fictionarchive-web-astro/src/lib/graphql/queries/chapter.graphql
index 197b028..9d7cc47 100644
--- a/fictionarchive-web-astro/src/lib/graphql/queries/chapter.graphql
+++ b/fictionarchive-web-astro/src/lib/graphql/queries/chapter.graphql
@@ -1,5 +1,5 @@
-query GetChapter($novelId: UnsignedInt!, $volumeId: UnsignedInt!, $chapterOrder: UnsignedInt!) {
-  chapter(novelId: $novelId, volumeId: $volumeId, chapterOrder: $chapterOrder) {
+query GetChapter($novelId: UnsignedInt!, $volumeOrder: UnsignedInt!, $chapterOrder: UnsignedInt!) {
+  chapter(novelId: $novelId, volumeOrder: $volumeOrder, chapterOrder: $chapterOrder) {
     id
     order
     name
@@ -20,9 +20,9 @@ query GetChapter($novelId: UnsignedInt!, $volumeId: UnsignedInt!, $chapterOrder:
     volumeName
     volumeOrder
     totalChaptersInVolume
-    prevChapterVolumeId
+    prevChapterVolumeOrder
     prevChapterOrder
-    nextChapterVolumeId
+    nextChapterVolumeOrder
     nextChapterOrder
   }
 }
diff --git a/fictionarchive-web-astro/src/pages/novels/[id]/volumes/[volumeId]/chapters/[chapterNumber].astro b/fictionarchive-web-astro/src/pages/novels/[id]/volumes/[volumeOrder]/chapters/[chapterNumber].astro
similarity index 58%
rename from fictionarchive-web-astro/src/pages/novels/[id]/volumes/[volumeId]/chapters/[chapterNumber].astro
rename to fictionarchive-web-astro/src/pages/novels/[id]/volumes/[volumeOrder]/chapters/[chapterNumber].astro
index 9399faf..d856ce2 100644
--- a/fictionarchive-web-astro/src/pages/novels/[id]/volumes/[volumeId]/chapters/[chapterNumber].astro
+++ b/fictionarchive-web-astro/src/pages/novels/[id]/volumes/[volumeOrder]/chapters/[chapterNumber].astro
@@ -2,9 +2,9 @@
 import AppLayout from '../../../../../../layouts/AppLayout.astro';
 import ChapterReaderPage from '../../../../../../lib/components/ChapterReaderPage.svelte';
 
-const { id, volumeId, chapterNumber } = Astro.params;
+const { id, volumeOrder, chapterNumber } = Astro.params;
 ---
 
 <AppLayout title="Reading - FictionArchive">
-	<ChapterReaderPage novelId={id} volumeId={volumeId} chapterNumber={chapterNumber} client:load />
+	<ChapterReaderPage novelId={id} volumeOrder={volumeOrder} chapterNumber={chapterNumber} client:load />
 </AppLayout>