diff --git a/salvi/templates/base.html b/salvi/templates/base.html
index 998968e..9f3deb1 100644
--- a/salvi/templates/base.html
+++ b/salvi/templates/base.html
@@ -1,8 +1,7 @@
 <!DOCTYPE html>
 <html lang="{{ g.lang }}">
   <head>
-	<meta charset="utf-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta charset="utf-8" />
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	{% block title %}
 	  <title>{{ app_name }}</title>
diff --git a/salvi/templates/listtag.html b/salvi/templates/listtag.html
index bb0c26a..a69a93b 100644
--- a/salvi/templates/listtag.html
+++ b/salvi/templates/listtag.html
@@ -10,8 +10,8 @@
   <div class="preview-subtitle">{{ T('notes-tagged') }}</div>
 
   <div class="inner-content">
-    {% if total_count > 0 %}
-    {{ nl_list(tagged_notes, page_n=page_n, total_count=total_count, hl_tags=(tagname,), other_url='tags/' + tagname) }}
+    {% if tagged_notes.total > 0 %}
+    {{ nl_list(tagged_notes, hl_tags=(tagname,), other_url='tags/' + tagname) }}
     {% else %}
     <p class="nl-placeholder">{{ T('notes-tagged-empty') }}</p>
     {% endif %}
diff --git a/salvi/templates/macros/nl.html b/salvi/templates/macros/nl.html
index e448d66..a4355fd 100644
--- a/salvi/templates/macros/nl.html
+++ b/salvi/templates/macros/nl.html
@@ -16,7 +16,7 @@
 {% if not is_main %}
 <p class="nl-pagination">
   Showing results <strong>{{ page_n * 20 - 19 }}</strong> to <strong>{{ min(page_n * 20, total_count) }}</strong>
-  of <strong>{{ total_count }}</strong> total.</p>
+  of <strong>{{ l.total }}</strong> total.</p>
 {% endif %}
 
 <ul class="nl-list">
@@ -62,7 +62,7 @@
 
   {% if is_main %}
   <li class="nl-next"><a href="/{{ other_url }}/">{{ T('show-all') }}</a></li>
-  {% elif page_n <= (total_count - 1) // 20 %}
+  {% elif page_n <= (l.total - 1) // 20 %}
   <li class="nl-next"><a href="/{{ other_url }}/?page={{ page_n + 1 }}">Next page &raquo;</a></li>
   {% endif %}
 </ul>
