diff --git a/blog/views.py b/blog/views.py
index 23c8e35..5bdaf10 100644
--- a/blog/views.py
+++ b/blog/views.py
@@ -10,7 +10,8 @@ def listing(request, tag, year, month, day, page):
     kwargs = {}
     kwargs['draft'] = False
 
-    view = index
+    view = 'index'
+
     if (tag == None):
         view = "index"
     else:
@@ -36,7 +37,10 @@ def listing(request, tag, year, month, day, page):
     except EmptyPage:
         posts = paginator.page(paginator.num_pages)
 
-    return render(request, 'blog/listing.html', { 'posts': posts, 'view': "blog:" + view })
+    if paginator.num_pages > 1:
+        view = view + 'page'
+
+    return render(request, 'blog/listing.html', { 'posts': posts, 'tag': tag, 'view': "blog:" + view })
 
 def index(request):
     return listing(request, None, None, None, None, 1)
diff --git a/gergelypolonkaiweb/templates/paginator.html b/gergelypolonkaiweb/templates/paginator.html
index 14d689b..10ea27b 100644
--- a/gergelypolonkaiweb/templates/paginator.html
+++ b/gergelypolonkaiweb/templates/paginator.html
@@ -1,19 +1,39 @@
 {% if list.paginator.num_pages > 1 %}
     <div class="paginator">
         {% if list.number > 1 %}
-            <a href="{% url view tag=tag %}">First</a>
+            {% if tag %}
+            <a href="{% url view page=1 tag=tag %}">First</a>
+            {% else %}
+            <a href="{% url view page=1 %}">First</a>
+            {% endif %}
         {% endif %}
         {% if list.has_previous and list.number != 2 %}
-            <a href="{% url view 'page'=list.previous_page_number 'tag'=tag %}">Previous</a>
+            {% if tag %}
+            <a href="{% url view page=list.previous_page_number tag=tag %}">Previous</a>
+            {% else %}
+            <a href="{% url view page=list.previous_page_number %}">Previous</a>
+            {% endif %}
         {% endif %}
         {% for i in posts.paginator.page_range %}
-            {% if list.number != i %}<a href="{% url view 'page'=i %}">{% endif %}{{ i }}{% if list.number != i %}</a>{% endif %}
+            {% if tag %}
+            {% if list.number != i %}<a href="{% url view page=i tag=tag %}">{% endif %}{{ i }}{% if list.number != i %}</a>{% endif %}
+            {% else %}
+            {% if list.number != i %}<a href="{% url view page=i %}">{% endif %}{{ i }}{% if list.number != i %}</a>{% endif %}
+            {% endif %}
         {% endfor %}
         {% if list.has_next and list.number != list.paginator.num_pages|add:-1 %}
-            <a href="{% url view 'page'=list.next_page_number 'tag'=tag %}">Next</a>
+            {% if tag %}
+            <a href="{% url view page=list.next_page_number tag=tag %}">Next</a>
+            {% else %}
+            <a href="{% url view page=list.next_page_number %}">Next</a>
+            {% endif %}
         {% endif %}
         {% if list.number < list.paginator.num_pages %}
-            <a href="{% url view 'page'=list.paginator.num_pages 'tag'=tag %}">Last</a>
+            {% if tag %}
+            <a href="{% url view page=list.paginator.num_pages tag=tag %}">Last</a>
+            {% else %}
+            <a href="{% url view page=list.paginator.num_pages %}">Last</a>
+            {% endif %}
         {% endif %}
     </div>
 {% endif %}