diff --git a/frontend/src/lib/components/DocumentRow.svelte b/frontend/src/lib/components/DocumentRow.svelte
index 61fdd652..d4f9534b 100644
--- a/frontend/src/lib/components/DocumentRow.svelte
+++ b/frontend/src/lib/components/DocumentRow.svelte
@@ -26,8 +26,8 @@ const hasMore = $derived(item.contributors.length >= 4);
 
 function tagClass(matched: boolean): string {
 	return matched
-		? 'inline-flex items-center gap-1 rounded px-2 py-0.5 text-[10px] font-bold tracking-widest uppercase bg-primary text-primary-fg transition-colors'
-		: 'inline-flex items-center gap-1 rounded px-2 py-0.5 text-[10px] font-bold tracking-widest uppercase bg-muted text-ink hover:bg-primary hover:text-primary-fg transition-colors';
+		? 'inline-flex items-center gap-1 rounded px-2 py-1.5 text-xs font-bold tracking-widest uppercase bg-primary text-primary-fg transition-colors'
+		: 'inline-flex items-center gap-1 rounded px-2 py-1.5 text-xs font-bold tracking-widest uppercase bg-muted text-ink hover:bg-primary hover:text-primary-fg transition-colors';
 }
 </script>
 
@@ -38,7 +38,7 @@ function tagClass(matched: boolean): string {
 			<div class="flex-1 sm:border-r sm:border-line sm:pr-5">
 				<!-- Title -->
 				<h3 class="mb-1 font-serif text-xl font-medium text-ink group-hover:underline">
-					{#each titleSegments as seg (seg.text + seg.highlight)}
+					{#each titleSegments as seg, i (i)}
 						{#if seg.highlight}
 							<mark
 								class="bg-transparent text-inherit underline decoration-brand-navy decoration-2 underline-offset-2"
@@ -53,7 +53,7 @@ function tagClass(matched: boolean): string {
 				<!-- Snippet -->
 				{#if snippetSegments}
 					<p class="mb-2 line-clamp-2 font-sans text-sm text-ink-2 italic">
-						{#each snippetSegments as seg (seg.text + seg.highlight)}
+						{#each snippetSegments as seg, i (i)}
 							{#if seg.highlight}
 								<mark
 									class="bg-transparent text-inherit underline decoration-brand-navy decoration-2 underline-offset-2"
@@ -114,7 +114,7 @@ function tagClass(matched: boolean): string {
 							<button
 								type="button"
 								class={tagClass(matchedTagIds.has(tag.id))}
-								onclick={() => goto('/documents?tag=' + encodeURIComponent(tag.name))}
+								onclick={(e) => { e.stopPropagation(); goto('/documents?tag=' + encodeURIComponent(tag.name)); }}
 							>
 								{#if tag.color}
 									<span class="h-1.5 w-1.5 rounded-full" style="background-color: {tag.color};"