diff --git a/templates/decisions-list.html b/templates/decisions-list.html
index 667eef2d66d228a07ce673c80ab372b4fbaf42af..9cf5721dac4203d0ed5c89e2b93ecf3033c40c02 100644
--- a/templates/decisions-list.html
+++ b/templates/decisions-list.html
@@ -2,7 +2,7 @@
 {% from "macros.html" import render_table, render_form %}
 {% block title %}Beschlüsse{% endblock %}
 
-{% macro page_link(text, _page=None, _page_length=None) %}
+{#{% macro page_link(text, _page=None, _page_length=None) %}
 	{% if _page is none %}
 		{% set _page = page %}
 	{% endif %}
@@ -10,7 +10,7 @@
 		{% set _page_length = page_length %}
 	{% endif %}
     <a href="{{url_for(request.endpoint, page=_page, protocoltype_id=protocoltype_id, search=search_term, decisioncategory_id=decisioncategory_id, page_length=_page_length)}}">{{text}}</a>
-{% endmacro %}
+{% endmacro %}#}
 
 {% block content %}
 <div class="container">
diff --git a/templates/macros.html b/templates/macros.html
index e6d0edd7c26a03c329daaccd5abd0e6f33815956..230a10073978ed63fe17a60cf77735d312e874ab 100644
--- a/templates/macros.html
+++ b/templates/macros.html
@@ -165,6 +165,18 @@ to not render a label for the CRSFTokenField -->
     </table>
 {%- endmacro %}
 
+{% macro page_link(text, _page=None, _page_length=None) -%}
+    {% set args = request.view_args.copy() %}
+    {% set _ = args.update(request.args) %}
+    {% if _page is not none %}
+        {% set _ = args.update({"page": _page}) %}
+    {% endif %}
+    {% if _page_length is not none %}
+        {% set _ = args.update({"page_length": _page_length}) %}
+    {% endif %}
+    <a href="{{url_for(request.endpoint, **args)}}">{{text}}</a>
+{%- endmacro %}
+
 {% macro render_likes(likes) -%}
     {% set timestamp = now() %}
     {% if timestamp.month == 4 and timestamp.day == 1 %}
diff --git a/templates/pagination-footer.html b/templates/pagination-footer.html
index 1f34556743d148f291e56d4c2fcbb1a313dce21b..19ae96bd5ce505313397b7d85e8a847dc7335cf1 100644
--- a/templates/pagination-footer.html
+++ b/templates/pagination-footer.html
@@ -1,3 +1,4 @@
+{% from "macros.html" import page_link %}
 <div class="centered">
     {% if page > page_diff %}
         {{page_link("<<", _page=0)}}
diff --git a/templates/protocols-list.html b/templates/protocols-list.html
index 02d3c81ee505e06950b72655f09d17243aa5a886..e019a255ae23589f55fb9df9d220c223d21d8ea9 100644
--- a/templates/protocols-list.html
+++ b/templates/protocols-list.html
@@ -2,18 +2,6 @@
 {% from "macros.html" import render_table, render_form %}
 {% block title %}Protokolle{% endblock %}
 
-{% macro page_link(text, _page=None, _page_length=None) %}
-	{% if _page is none %}
-		{% set _page = page %}
-	{% endif %}
-	{% if _page_length is none %}
-		{% set _page_length = page_length %}	
-	{% endif %}
-    <a href="{{url_for(request.endpoint, page=_page, protocoltype_id=protocoltype_id, search=search_term, state_open=state_open, page_length=_page_length)}}">{{text}}</a>
-{% endmacro %}
-
-
-
 {% block content %}
 <div class="container">
     {{render_form(search_form, class_="form-inline", action_url=url_for("list_protocols"), action_text="Suchen", labels_visible=False, method="GET")}}
diff --git a/templates/todos-list.html b/templates/todos-list.html
index 0734992cdf861046927284fef46743b8d8338a3b..0c9923ee51cd34f9147f7c506a84abd73690b877 100644
--- a/templates/todos-list.html
+++ b/templates/todos-list.html
@@ -2,16 +2,6 @@
 {% from "macros.html" import render_table, render_form %}
 {% block title %}Todos{% endblock %}
 
-{% macro page_link(text, _page=None, _page_length=None) %}
-	{% if _page is none %}
-		{% set _page = page %}
-	{% endif %}
-	{% if _page_length is none %}
-		{% set _page_length = page_length %}
-	{% endif %}
-    <a href="{{url_for(request.endpoint, page=_page, protocoltype_id=protocoltype_id, search=search_term, state_open=state_open, page_length=_page_length)}}">{{text}}</a>
-{% endmacro %}
-
 {% block content %}
 <div class="container">
     {{render_form(search_form, class_="form-inline", action_url=url_for("list_todos"), action_text="Suchen", labels_visible=False, method="GET")}}