diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index cc0c48f..bcc7a82 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -15,15 +15,17 @@
         {{ end }}
 
         <div class="page-list">
-            <ul>
-                {{ range .Paginator.Pages }}
-                    <li>{{ .Render "summary/post" }}</li>
-                {{ else }}
-                    <div>
-                        {{ i18n "no_posts" }}
-                    </div>
-                {{ end }}
-            </ul>
+            {{ with .Paginator.Pages }}
+                <ul>
+                    {{ range . }}
+                        <li>{{ .Render "summary/post" }}</li>
+                    {{ end }}
+                </ul>
+            {{ else }}
+                <div>
+                    {{ i18n "no_posts" }}
+                </div>
+            {{ end }}
         </div>
     </div>
 
diff --git a/layouts/authors/list.html b/layouts/authors/list.html
index 33b6e1e..5e6833e 100644
--- a/layouts/authors/list.html
+++ b/layouts/authors/list.html
@@ -5,10 +5,16 @@
     </h1>
 
     <div class="page-list">
-        <ul>
-            {{ range .Paginator.Pages }}
-                <li>{{ .Render "summary/author" }}</li>
-            {{ end }}
-        </ul>
+        {{ with .Paginator.Pages }}
+            <ul>
+                {{ range . }}
+                    <li>{{ .Render "summary/author" }}</li>
+                {{ end }}
+            </ul>
+        {{ else }}
+            <div>
+                {{ i18n "no_posts" }}
+            </div>
+        {{ end }}
     </div>
 {{ end }}
diff --git a/layouts/authors/term.html b/layouts/authors/term.html
index d7f17e0..6e77df1 100644
--- a/layouts/authors/term.html
+++ b/layouts/authors/term.html
@@ -10,15 +10,17 @@
     {{ .Content }}
 
     <div class="page-list">
-        <ul>
-            {{ range .Paginator.Pages }}
-                <li>{{ .Render "summary/post" }}</li>
-            {{ else }}
-                <div>
-                    {{ i18n "no_posts" }}
-                </div>
-            {{ end }}
-        </ul>
+        {{ with .Paginator.Pages }}
+            <ul>
+                {{ range . }}
+                    <li>{{ .Render "summary/post" }}</li>
+                {{ end }}
+            </ul>
+        {{ else }}
+            <div>
+                {{ i18n "no_posts" }}
+            </div>
+        {{ end }}
     </div>
 
     {{ partial "pagination.html" . }}
diff --git a/layouts/series/list.html b/layouts/series/list.html
index d4f1f09..205cbab 100644
--- a/layouts/series/list.html
+++ b/layouts/series/list.html
@@ -5,10 +5,16 @@
     </h1>
 
     <div class="series-taxonomy">
-        <ul>
-            {{ range .Pages }}
-                <li>{{ .Render "summary/series" }}</li>
-            {{ end }}
-        </ul>
+        {{ with .Pages }}
+            <ul>
+                {{ range . }}
+                    <li>{{ .Render "summary/series" }}</li>
+                {{ end }}
+            </ul>
+        {{ else }}
+            <div>
+                {{ i18n "no_posts" }}
+            </div>
+        {{ end }}
     </div>
 {{ end }}
diff --git a/layouts/series/term.html b/layouts/series/term.html
index 1e1a8c2..17690b9 100644
--- a/layouts/series/term.html
+++ b/layouts/series/term.html
@@ -10,20 +10,22 @@
     {{ partial "description-or-summary.html" . }}
 
     <div class="page-list">
-        <ul>
-            {{ $i := 0 }}
-            {{ $total := len .Pages }}
-            {{ range .Paginator.Pages.Reverse }}
-                {{ $i = add 1 $i }}
-                {{ .Scratch.Set "series_position" $i }}
-                {{ .Scratch.Set "series_total" $total }}
-                <li>{{ .Render "summary/post" }}</li>
-            {{ else }}
-                <div>
-                    {{ i18n "no_posts" }}
-                </div>
-            {{ end }}
-        </ul>
+        {{ with .Paginator.Pages.Reverse }}
+            <ul>
+                {{ $i := 0 }}
+                {{ $total := len $.Pages }}
+                {{ range . }}
+                    {{ $i = add 1 $i }}
+                    {{ .Scratch.Set "series_position" $i }}
+                    {{ .Scratch.Set "series_total" $total }}
+                    <li>{{ .Render "summary/post" }}</li>
+                {{ end }}
+            </ul>
+        {{ else }}
+            <div>
+                {{ i18n "no_posts" }}
+            </div>
+        {{ end }}
     </div>
 
     {{ partial "pagination.html" . }}
diff --git a/layouts/tags/list.html b/layouts/tags/list.html
index b3f4597..38ef5fd 100644
--- a/layouts/tags/list.html
+++ b/layouts/tags/list.html
@@ -5,12 +5,18 @@
     </h1>
 
     <div class="tag-list">
-        <ul>
-            {{ range .Data.Terms.Alphabetical }}
-                <a href="{{ .Page.Permalink }}">
-                    <li>{{ .Page.Title | markdownify }}</li>
-                </a>
-            {{ end }}
-        </ul>
+        {{ with .Data.Terms.Alphabetical }}
+            <ul>
+                {{ range . }}
+                    <a href="{{ .Page.Permalink }}">
+                        <li>{{ .Page.Title | markdownify }}</li>
+                    </a>
+                {{ end }}
+            </ul>
+        {{ else }}
+            <div>
+                {{ i18n "no_posts" }}
+            </div>
+        {{ end }}
     </div>
 {{ end }}
diff --git a/layouts/tags/term.html b/layouts/tags/term.html
index 9557abf..db93025 100644
--- a/layouts/tags/term.html
+++ b/layouts/tags/term.html
@@ -7,15 +7,17 @@
 
     {{ partial "description-or-summary.html" . }}
     <div class="page-list">
-        <ul>
-            {{ range .Paginator.Pages }}
-                <li>{{ .Render "summary/post" }}</li>
-            {{ else }}
-                <div>
-                    {{ i18n "no_posts" }}
-                </div>
-            {{ end }}
-        </ul>
+        {{ with .Paginator.Pages }}
+            <ul>
+                {{ range . }}
+                    <li>{{ .Render "summary/post" }}</li>
+                {{ end }}
+            </ul>
+        {{ else }}
+            <div>
+                {{ i18n "no_posts" }}
+            </div>
+        {{ end }}
     </div>
 
     {{ partial "pagination.html" . }}
diff --git a/layouts/taxonomy/list.html b/layouts/taxonomy/list.html
index 8952ec6..fdc8849 100644
--- a/layouts/taxonomy/list.html
+++ b/layouts/taxonomy/list.html
@@ -10,12 +10,18 @@
     </h1>
 
     <div class="taxonomy">
-        <ul>
-            {{ range .Data.Terms.Alphabetical }}
-                <li>
-                    <a href="{{ .Page.Permalink }}">{{ .Page.Title | markdownify }}</a>
-                </li>
-            {{ end }}
-        </ul>
+        {{ with .Data.Terms.Alphabetical }}
+            <ul>
+                {{ range . }}
+                    <li>
+                        <a href="{{ .Page.Permalink }}">{{ .Page.Title | markdownify }}</a>
+                    </li>
+                {{ end }}
+            </ul>
+        {{ else }}
+            <div>
+                {{ i18n "no_posts" }}
+            </div>
+        {{ end }}
     </div>
 {{ end }}
diff --git a/layouts/taxonomy/term.html b/layouts/taxonomy/term.html
index 256132d..3f5c288 100644
--- a/layouts/taxonomy/term.html
+++ b/layouts/taxonomy/term.html
@@ -12,15 +12,17 @@
 
     {{ partial "description-or-summary.html" . }}
     <div class="page-list">
-        <ul>
-            {{ range .Paginator.Pages }}
-                <li>{{ .Render "summary/post" }}</li>
-            {{ else }}
-                <div>
-                    {{ i18n "no_posts" }}
-                </div>
-            {{ end }}
-        </ul>
+        {{ with .Paginator.Pages }}
+            <ul>
+                {{ range . }}
+                    <li>{{ .Render "summary/post" }}</li>
+                {{ end }}
+            </ul>
+        {{ else }}
+            <div>
+                {{ i18n "no_posts" }}
+            </div>
+        {{ end }}
     </div>
 
     {{ partial "pagination.html" . }}