diff --git a/src/super_archives/templates/message-list.html b/src/super_archives/templates/message-list.html
index 4ce88c4..ead8566 100644
--- a/src/super_archives/templates/message-list.html
+++ b/src/super_archives/templates/message-list.html
@@ -13,9 +13,9 @@
       <h4>{% trans "Sort by" %}</h4>
       <ul class="unstyled-list">
         <li {% ifequal order_by "hottest" %} title="{% trans "Remove filter" %}" {% endifequal %}>
-         <span class="glyphicon glyphicon-chevron-right"></span> <a href="{% ifequal order_by "hottest" %} {% append_to_get order="",p=1 %} {% else %} {% append_to_get order='hottest',p=1 %} {% endifequal %}">{% trans "Relevance" %}</a></li>
+         <span class="glyphicon glyphicon-chevron-right"></span> <a href="{% ifequal order_by "hottest" %} {% append_to_get order="" p=1 %} {% else %} {% append_to_get order='hottest' p=1 %} {% endifequal %}">{% trans "Relevance" %}</a></li>
         <li {% ifequal order_by "latest" %} title="{% trans "Remove filter" %}" {% endifequal %}>
-          <span class="glyphicon glyphicon-chevron-right"></span> <a href="{% ifequal order_by "latest" %} {% append_to_get order="",p=1 %} {% else %} {% append_to_get order='latest',p=1 %} {% endifequal %}">
+          <span class="glyphicon glyphicon-chevron-right"></span> <a href="{% ifequal order_by "latest" %} {% append_to_get order="" p=1 %} {% else %} {% append_to_get order='latest' p=1 %} {% endifequal %}">
             {% trans "Recent activity" %}</a></li>
       </ul>
 
@@ -23,7 +23,7 @@
       <ul class="unstyled-list">
         {% for list in lists %}
           <li {% if list.name == selected_list %} title="{% trans "Remove filter" %}" class="selected" {% endif %}>
-            <span class="glyphicon {% if list.name == selected_list %}glyphicon-remove{% else %}glyphicon-chevron-right{% endif %}"></span> <a href="{% ifnotequal list.name selected_list %} {% append_to_get list=list.name,p=1 %} {% else %} {% append_to_get list="",p=1 %}
+            <span class="glyphicon {% if list.name == selected_list %}glyphicon-remove{% else %}glyphicon-chevron-right{% endif %}"></span> <a href="{% ifnotequal list.name selected_list %} {% append_to_get list=list.name p=1 %} {% else %} {% append_to_get list="" p=1 %}
             {% endifnotequal %}">{{ list.name }}</a></li>
         {% endfor %}
       </ul>
diff --git a/src/super_archives/templatetags/append_to_get.py b/src/super_archives/templatetags/append_to_get.py
index 7dfbcb4..79dbf1c 100644
--- a/src/super_archives/templatetags/append_to_get.py
+++ b/src/super_archives/templatetags/append_to_get.py
@@ -1,56 +1,67 @@
+# -*- coding: utf-8 -*-
 
 import urllib
 from django import template
 
 register = template.Library()
 
-"""
-Decorator to facilitate template tag creation
-"""
-def easy_tag(func):
-    """deal with the repetitive parts of parsing template tags"""
-    def inner(parser, token):
-        #print token
-        try:
-            return func(*token.split_contents())
-        except TypeError:
-            raise template.TemplateSyntaxError('Bad arguments for tag "%s"' %
-                                                token.split_contents()[0])
-    inner.__name__ = func.__name__
-    inner.__doc__ = inner.__doc__
-    return inner
-
-
-class AppendGetNode(template.Node):
-    def __init__(self, dict):
-        self.dict_pairs = {}
-        for pair in dict.split(','):
-            pair = pair.split('=')
-            self.dict_pairs[pair[0]] = template.Variable(pair[1])
-            
-    def render(self, context):
-        get = context['request'].GET.copy()
-
-        for key in self.dict_pairs:
-            get[key] = self.dict_pairs[key].resolve(context)
-        
-        path = context['request'].META['PATH_INFO']
-                
-        if len(get):
-            # Convert all unicode objects in the get dict to 
-            #   str (utf-8 encoded)
-            get_utf_encoded = {}
-            for (key, value) in get.items():
-                if isinstance(value, unicode):
-                    value = value.encode('utf-8')
-                get_utf_encoded.update({key: value})
-            get_utf_encoded = dict(get_utf_encoded)
-
-            path = '?' + urllib.urlencode(get_utf_encoded)
-
-        return path
-
-@register.tag()
-@easy_tag
-def append_to_get(_tag_name, dict):
-    return AppendGetNode(dict)
+
+@register.simple_tag(takes_context=True)
+def append_to_get(context, **kwargs):
+    # Getting the path with the query
+    current_url = u'{}?{}'.format(
+        context['request'].META['PATH_INFO'],
+        context['request'].META['QUERY_STRING'],
+    )
+
+    if kwargs and context['request'].META['QUERY_STRING']:
+        current_url += '&'
+
+    for key, value in kwargs.items():
+        # get the key, value to check if the pair exists in the query
+        new = u'{}={}'.format(key, value)
+
+        if new in current_url:
+            continue
+
+        if key not in current_url:
+            current_url += u'{}={}&'.format(key, value)
+            continue
+
+        parse_url = current_url.split(key)
+
+        if len(parse_url) > 2:
+            continue
+
+        if unicode(value) in parse_url[1][1:]:
+            continue
+
+        check_kwargs_values = [
+            False for value in kwargs.values()
+            if unicode(value) not in parse_url[1]
+        ]
+
+        if not all(check_kwargs_values):
+            list_remaining = parse_url[1][1:].split('&')
+            real_remaining = u''
+
+            if len(list_remaining) >= 2:
+                real_remaining = u'&'.join(list_remaining[1:])
+
+            current_url = u'{url}{key}={value}&{remaining}'.format(
+                url=parse_url[0],
+                key=key,
+                value=value,
+                remaining=real_remaining,
+            )
+            continue
+
+        current_url = u'{url}{key}={value}+{remaining_get}'.format(
+            url=parse_url[0],
+            key=key,
+            value=value,
+            remaining_get=parse_url[1][1:],
+        )
+    if current_url[-1] == '&':
+        return current_url[:-1]
+    return current_url
--
libgit2 0.21.2