diff --git a/views/routes/baende/body.gohtml b/views/routes/baende/body.gohtml
index f3a4b1f..10a9e47 100644
--- a/views/routes/baende/body.gohtml
+++ b/views/routes/baende/body.gohtml
@@ -73,13 +73,6 @@
 		selectedLetter = params.get('letter') || '';
 		sortField = params.get('sort') || sortField;
 		sortOrder = params.get('order') || sortOrder;
-		const nextOffsetAttr = $event.detail.target.dataset.nextOffset;
-		if (nextOffsetAttr) {
-			const parsed = Number(nextOffsetAttr);
-			if (!Number.isNaN(parsed)) {
-				offset = parsed;
-			}
-		}
 		updateUrl();
 	}
 "
diff --git a/views/routes/baende/more/body.gohtml b/views/routes/baende/more/body.gohtml
index 7c8f256..8cf868d 100644
--- a/views/routes/baende/more/body.gohtml
+++ b/views/routes/baende/more/body.gohtml
@@ -159,8 +159,3 @@
 		</td>
 	</tr>
 {{- end -}}
-
-<!-- Update count display with OOB swap -->
-<div id="baende-count" class="text-lg font-semibold font-sans text-gray-600 whitespace-nowrap" hx-swap-oob="true">
-	{{ if $model.current_count }}{{ $model.current_count }}&thinsp;/&thinsp;{{ end }}{{ if $model.total_count }}{{ $model.total_count }}{{ else }}{{ len $model.result.Entries }}{{ end }} Bände
-</div>
diff --git a/views/routes/baende/results/body.gohtml b/views/routes/baende/results/body.gohtml
index 036c84f..7120dcc 100644
--- a/views/routes/baende/results/body.gohtml
+++ b/views/routes/baende/results/body.gohtml
@@ -3,7 +3,7 @@
 <div id="baenderesults"
      x-data="{ hasMore: {{ if $model.has_more }}true{{ else }}false{{ end }}, offset: {{ if $model.next_offset }}{{ $model.next_offset }}{{ else }}0{{ end }}, loading: false }">
 
-	<div id="baende-count" class="text-lg font-semibold font-sans text-gray-600 whitespace-nowrap" hx-swap-oob="true">
+	<div id="baende-count" class="text-lg font-semibold font-sans text-gray-600 whitespace-nowrap">
 		{{ if $model.current_count }}{{ $model.current_count }}&thinsp;/&thinsp;{{ end }}{{ if $model.total_count }}{{ $model.total_count }}{{ else }}{{ len $model.result.Entries }}{{ end }} Bände
 	</div>
 
@@ -15,15 +15,12 @@
 			type="button"
 			class="content-action-button"
 			hx-get="/baende/more/?offset={{ if $model.next_offset }}{{ $model.next_offset }}{{ else }}0{{ end }}{{ if $model.search }}&search={{ $model.search }}{{ end }}{{ if $model.letter }}&letter={{ $model.letter }}{{ end }}&sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
-			hx-push-url="/baende/?offset={{ if $model.next_offset }}{{ $model.next_offset }}{{ else }}0{{ end }}{{ if $model.search }}&search={{ $model.search }}{{ end }}{{ if $model.letter }}&letter={{ $model.letter }}{{ end }}&sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
 			hx-target="#baende-tbody"
 			hx-swap="beforeend"
 			hx-indicator="this"
-			@htmx:before-request="loading = true"
-			@htmx:after-request="loading = false; hasMore = $event.detail.xhr.getResponseHeader('X-Has-More') === 'true'; offset = {{ if $model.next_offset }}{{ $model.next_offset }}{{ else }}0{{ end }}"
-			:disabled="loading">
-			<i class="ri-arrow-down-line" :class="{ 'spinning': loading }"></i>
-			<span x-text="loading ? 'Lädt...' : 'Weitere 150 laden'"></span>
+			>
+			<i class="ri-arrow-down-line"></i>
+			<span>Weitere 150 laden</span>
 		</button>
 	</div>