diff --git a/web-src/src/components/IndexButtonList.vue b/web-src/src/components/IndexButtonList.vue
index 689fbaa0..92853ada 100644
--- a/web-src/src/components/IndexButtonList.vue
+++ b/web-src/src/components/IndexButtonList.vue
@@ -5,7 +5,7 @@
         v-for="index in indices"
         :key="index"
         class="button is-small"
-        :to="'#index_' + index"
+        :to="{ hash: `#index_${index}`, query: $route.query }"
         >{{ index }}</router-link
       >
     </nav>
diff --git a/web-src/src/templates/ContentWithHeading.vue b/web-src/src/templates/ContentWithHeading.vue
index 1f04b6b3..e7990c9f 100644
--- a/web-src/src/templates/ContentWithHeading.vue
+++ b/web-src/src/templates/ContentWithHeading.vue
@@ -53,7 +53,7 @@ export default {
       return this.options_visible ? 'chevron-up' : 'chevron-down'
     },
     position() {
-      return { hash: this.options_visible ? '#top' : '#app' }
+      return { hash: this.options_visible ? '#top' : '#app', query: this.$route.query }
     }
   },
   mounted() {