diff --git a/web/src/lib/components/photo/PhotoCard.svelte b/web/src/lib/components/photo/PhotoCard.svelte
index db2049b..a54b35d 100644
--- a/web/src/lib/components/photo/PhotoCard.svelte
+++ b/web/src/lib/components/photo/PhotoCard.svelte
@@ -51,7 +51,7 @@
 </script>
 
 <a
-	href={photoLink}
+	href={resolve(photoLink)}
 	class="photo-card"
 	class:photo-card-waterfall={waterfall}
 	class:photo-card-compact-waterfall={borderLess && waterfall}
@@ -197,6 +197,7 @@
 		padding: 0 var(--space-xs);
 		transition: visibility var(--transition-slow) cubic-bezier(0.4, 0, 0.2, 1);
 	}
+
 	.photo-name-hide {
 		display: none;
 	}
diff --git a/web/src/lib/components/photo/PhotoGrid.svelte b/web/src/lib/components/photo/PhotoGrid.svelte
index 3925a6d..15b4fcd 100644
--- a/web/src/lib/components/photo/PhotoGrid.svelte
+++ b/web/src/lib/components/photo/PhotoGrid.svelte
@@ -101,7 +101,7 @@
 		{#key waterfall + '_' + borderLess + '_' + columnCount}
 			{#if waterfall}
 				<div class="photo-grid-waterfall" class:photo-grid-borderless={borderLess}>
-					{#each splitToColumns(getVisiblePhotos(), columnCount) as col}
+					{#each splitToColumns(getVisiblePhotos(), columnCount) as col (col)}
 						<div class="waterfall-column">
 							{#each col as photo (photo.id)}
 								<PhotoCard
diff --git a/web/src/routes/album/[id]/+page.svelte b/web/src/routes/album/[id]/+page.svelte
index 0dddbec..ebb2785 100644
--- a/web/src/routes/album/[id]/+page.svelte
+++ b/web/src/routes/album/[id]/+page.svelte
@@ -165,10 +165,15 @@
 	// 处理排序变化
 	function applySort() {
 		// 重置分页状态并导航到新 URL
-		goto(`${page.url.pathname}?page=1&pageSize=${PAGE_SIZE}&sort=${sortMode}&order=${sortOrder}`, {
-			replaceState: true,
-			keepFocus: true
-		});
+		goto(
+			resolve(
+				`${page.url.pathname}?page=1&pageSize=${PAGE_SIZE}&sort=${sortMode}&order=${sortOrder}`
+			),
+			{
+				replaceState: true,
+				keepFocus: true
+			}
+		);
 	}
 
 	/**