diff --git a/core/templates/core/macros.jinja b/core/templates/core/macros.jinja
index 58ef38b2..e8db2201 100644
--- a/core/templates/core/macros.jinja
+++ b/core/templates/core/macros.jinja
@@ -254,14 +254,5 @@
 
 
 {% macro querystring() %}
-  {%- for key, values in request.GET.lists() -%}
-    {%- if key not in kwargs -%}
-      {%- for value in values -%}
-        {{ key }}={{ value }}&
-      {%- endfor -%}
-    {%- endif -%}
-  {%- endfor -%}
-  {%- for key, value in kwargs.items() -%}
-    {{ key }}={{ value }}&
-  {%- endfor -%}
+  {{- urlencode(dict(dict(request.GET.lists()) | items | list + kwargs | items | list), doseq=True) -}}
 {% endmacro %}
\ No newline at end of file
diff --git a/sith/settings.py b/sith/settings.py
index 66193c4f..ac90ef86 100644
--- a/sith/settings.py
+++ b/sith/settings.py
@@ -190,6 +190,7 @@ TEMPLATES = [
                 "get_sith": "com.views.sith",
                 "get_language": "django.utils.translation.get_language",
                 "timedelta": "datetime.timedelta",
+                "urlencode": "urllib.parse.urlencode",
             },
             "bytecode_cache": {
                 "name": "default",