diff --git a/templates/decisions-list.html b/templates/decisions-list.html
index a6c3928e90ecad199da15e62777641b49f95f777..61dd2960f9f817bc92625e5ac33b1ac1eeea0b84 100644
--- a/templates/decisions-list.html
+++ b/templates/decisions-list.html
@@ -3,7 +3,13 @@
 {% block title %}Beschlüsse{% endblock %}
 
 {% macro page_link(text, _page=None, _page_length=None) %}
-    <a href="{{url_for(request.endpoint, page=_page or page, protocoltype=protocoltype_id, search=search_term, decisioncategory_id=decisioncategory_id, page_length=_page_length or page_length)}}">{{text}}</a>
+	{% 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=protocoltype_id, search=search_term, decisioncategory_id=decisioncategory_id, page_length=_page_length)}}">{{text}}</a>
 {% endmacro %}
 
 {% block content %}
diff --git a/templates/protocols-list.html b/templates/protocols-list.html
index c3a2d36abf32d7096997a7ee07aa88520d958702..acbd4182ae16a7ab1237ef621bf32571486c2fac 100644
--- a/templates/protocols-list.html
+++ b/templates/protocols-list.html
@@ -3,7 +3,13 @@
 {% block title %}Protokolle{% endblock %}
 
 {% macro page_link(text, _page=None, _page_length=None) %}
-    <a href="{{url_for(request.endpoint, page=_page or page, protocoltype=protocoltype_id, search=search_term, state_open=state_open, page_length=_page_length or page_length)}}">{{text}}</a>
+	{% 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=protocoltype_id, search=search_term, state_open=state_open, page_length=_page_length)}}">{{text}}</a>
 {% endmacro %}
 
 {% block content %}
diff --git a/templates/todos-list.html b/templates/todos-list.html
index 49f8134288b60a8ad9b2b914cce1d135baeacd7e..0734992cdf861046927284fef46743b8d8338a3b 100644
--- a/templates/todos-list.html
+++ b/templates/todos-list.html
@@ -3,7 +3,13 @@
 {% block title %}Todos{% endblock %}
 
 {% macro page_link(text, _page=None, _page_length=None) %}
-    <a href="{{url_for(request.endpoint, page=_page or page, protocoltype=protocoltype_id, search=search_term, state_open=state_open, page_length=_page_length or page_length)}}">{{text}}</a>
+	{% 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 %}