diff --git a/archivebox/core/settings.py b/archivebox/core/settings.py
index 7be4f3e6..460a17a6 100644
--- a/archivebox/core/settings.py
+++ b/archivebox/core/settings.py
@@ -99,6 +99,7 @@ INSTALLED_APPS = [
     'django_jsonform',           # handles rendering Pydantic models to Django HTML widgets/forms  https://github.com/bhch/django-jsonform
     'signal_webhooks',           # handles REST API outbound webhooks                              https://github.com/MrThearMan/django-signal-webhooks
     'django_object_actions',     # provides easy Django Admin action buttons on change views       https://github.com/crccheck/django-object-actions
+    'url_tools',                 # adds template tags to append/toggle URL parameters              https://bitbucket.org/monwara/django-url-tools
 
     # Our ArchiveBox-provided apps
     #'config',                   # ArchiveBox config settings (loaded as a plugin, don't need to add it here)
@@ -203,6 +204,7 @@ TEMPLATES = [
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
+                'url_tools.context_processors.current_url',
             ],
         },
     },
diff --git a/archivebox/templates/core/public_index.html b/archivebox/templates/core/public_index.html
index 1401dd63..e9655b92 100644
--- a/archivebox/templates/core/public_index.html
+++ b/archivebox/templates/core/public_index.html
@@ -54,8 +54,8 @@
         <br/>
         <span class="step-links">
             {% if page_obj.has_previous %}
-                <a href="{% url 'public-index' %}?page=1">&laquo; first</a> &nbsp;
-                <a href="{% url 'public-index' %}?page={{ page_obj.previous_page_number }}">previous</a>
+                <a href="{% add_params request.get_full_path page='1' %}">&laquo; first</a> &nbsp;
+                <a href="{% add_params request.get_full_path page=page_obj.previous_page_number %}">previous</a>
                 &nbsp;
             {% endif %}
     
@@ -65,8 +65,8 @@
         
             {% if page_obj.has_next %}
                 &nbsp;
-                <a href="{% url 'public-index' %}?page={{ page_obj.next_page_number }}">next </a> &nbsp;
-                <a href="{% url 'public-index' %}?page={{ page_obj.paginator.num_pages }}">last &raquo;</a>
+                <a href="{% add_params request.get_full_path page=page_obj.next_page_number %}">next </a> &nbsp;
+                <a href="{% add_params request.get_full_path page=page_obj.paginator.num_pages %}">last &raquo;</a>
             {% endif %}
         </span>
         <br>
diff --git a/pdm.lock b/pdm.lock
index 9d173c51..58e90548 100644
--- a/pdm.lock
+++ b/pdm.lock
@@ -5,7 +5,7 @@
 groups = ["default", "all", "ldap", "sonic"]
 strategy = ["inherit_metadata"]
 lock_version = "4.5.0"
-content_hash = "sha256:d35702a8094586329c85290f6709dfe303ba7bbd62d78048989b67086c8a63dd"
+content_hash = "sha256:a03237d9196e1d9b2f82130d026c5fa9eaf165a7d2079393baa2205bedd92674"
 
 [[metadata.targets]]
 requires_python = "==3.11.*"
@@ -642,6 +642,17 @@ files = [
     {file = "django_taggit-1.3.0-py3-none-any.whl", hash = "sha256:609b0223d8a652f3fae088b7fd29f294fdadaca2d7931d45c27d6c59b02fdf31"},
 ]
 
+[[package]]
+name = "django-url-tools"
+version = "0.0.8"
+summary = "Django helpers for dealing with URLs in templates"
+groups = ["default"]
+marker = "python_version == \"3.11\""
+files = [
+    {file = "django-url-tools-0.0.8.tar.gz", hash = "sha256:012cf28796265cd805b502f360c9a86f750b02dd7d5c770fc878bf1dead5aada"},
+    {file = "django-url-tools-0.0.8.zip", hash = "sha256:9d9cb034d3e1768ef4b98ab3e3ebb75eae51530d04c11ad19ecbefa30831d762"},
+]
+
 [[package]]
 name = "et-xmlfile"
 version = "1.1.0"
@@ -993,19 +1004,6 @@ dependencies = [
     "requests",
 ]
 
-[[package]]
-name = "pocket"
-version = "0.3.7"
-git = "https://github.com/tapanpandita/pocket.git"
-ref = "v0.3.7"
-revision = "5a144438cc89bfc0ec94db960718ccf1f76468c1"
-summary = "api wrapper for getpocket.com"
-groups = ["default"]
-marker = "python_version == \"3.11\""
-dependencies = [
-    "requests",
-]
-
 [[package]]
 name = "prompt-toolkit"
 version = "3.0.48"
diff --git a/pyproject.toml b/pyproject.toml
index afcf402d..e0b16a9e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -88,6 +88,7 @@ dependencies = [
     "base32-crockford==0.3.0",
     ############# Extractor Dependencies #############
     "yt-dlp>=2024.8.6",               # for: media
+    "django-url-tools>=0.0.8",
 ]
 
 # pdm lock --group=':all'