diff --git a/templates/djpress/stuartmnz/index.html b/templates/djpress/stuartmnz/index.html
index e2595c9..d63fc3c 100644
--- a/templates/djpress/stuartmnz/index.html
+++ b/templates/djpress/stuartmnz/index.html
@@ -20,11 +20,11 @@
         {% for page in page_range %}
           {% if page == current_page %}
             <li class="page-item active" aria-current="page">
-              <a class="page-link" href="?page={{ page }}">{{ page }}</a>
+              <a class="page-link" href="{% querystring page=page %}">{{ page }}</a>
             </li>
           {% else %}
             <li class="page-item">
-              <a class="page-link" href="?page={{ page }}">{{ page }}</a>
+              <a class="page-link" href="{% querystring page=page %}">{{ page }}</a>
             </li>
           {% endif %}
         {% endfor %}
diff --git a/templates/djpress/stuartmnz/search.html b/templates/djpress/stuartmnz/search.html
index e2df7ff..e4d1b5b 100644
--- a/templates/djpress/stuartmnz/search.html
+++ b/templates/djpress/stuartmnz/search.html
@@ -25,11 +25,11 @@
           {% for page in page_range %}
             {% if page == current_page %}
               <li class="page-item active" aria-current="page">
-                <a class="page-link" href="?page={{ page }}">{{ page }}</a>
+                <a class="page-link" href="{% querystring page=page %}">{{ page }}</a>
               </li>
             {% else %}
               <li class="page-item">
-                <a class="page-link" href="?page={{ page }}">{{ page }}</a>
+                <a class="page-link" href="{% querystring page=page %}">{{ page }}</a>
               </li>
             {% endif %}
           {% endfor %}