diff --git a/layouts/_default/list.atom.xml b/layouts/_default/list.atom.xml
index bfd6aa5f..ec704e5e 100644
--- a/layouts/_default/list.atom.xml
+++ b/layouts/_default/list.atom.xml
@@ -8,17 +8,11 @@
 {{ $limit := site.Config.Services.RSS.Limit }}
 {{ $logo := $page.Param "paige.feeds.atom.logo" | absLangURL }}
 {{ $rights := site.Copyright | markdownify }}
-{{ $subpages := slice }}
+{{ $subpages := $page.RegularPagesRecursive.ByPublishDate.Reverse }}
 {{ $subtitle := $page.Description | markdownify }}
 
 {{ $lastmod := site.Lastmod.Format $date }}
 
-{{ range $page.RegularPagesRecursive.ByPublishDate.Reverse }}
-    {{ if not (.Param "paige.exclude_feeds") }}
-        {{ $subpages = $subpages | append . }}
-    {{ end }}
-{{ end }}
-
 {{ if gt $limit 0 }}
     {{ $subpages = first $limit $subpages }}
 {{ end }}
@@ -99,94 +93,96 @@
     <updated>{{ $lastmod }}</updated>
 
     {{ range $subpage := $subpages }}
-        <entry>
-            {{ $content := .Content }}
-            {{ $external := and .Params.link (not (.Param "paige.feeds.disable_link")) | not | not }}
-            {{ $id := printf "tag:%s,%s:%s" (urls.Parse site.BaseURL).Host (.PublishDate.Format "2006-01-02") .RelPermalink }}
-            {{ $lastmod := .Lastmod.Format $date }}
-            {{ $published := cond (not .PublishDate.IsZero) (.PublishDate.Format $date) "" }}
-            {{ $summary := markdownify .Description }}
-            {{ $title := markdownify .Title }}
+        {{ if not (.Param "paige.exclude_feeds") }}
+            <entry>
+                {{ $content := .Content }}
+                {{ $external := and .Params.link (not (.Param "paige.feeds.disable_link")) | not | not }}
+                {{ $id := printf "tag:%s,%s:%s" (urls.Parse site.BaseURL).Host (.PublishDate.Format "2006-01-02") .RelPermalink }}
+                {{ $lastmod := .Lastmod.Format $date }}
+                {{ $published := cond (not .PublishDate.IsZero) (.PublishDate.Format $date) "" }}
+                {{ $summary := markdownify .Description }}
+                {{ $title := markdownify .Title }}
 
-            {{ $link := cond $external .Params.link .Permalink }}
+                {{ $link := cond $external .Params.link .Permalink }}
 
-            {{ if and $content $external }}
-                {{ $text := or (.Param "paige.feeds.page_link" | markdownify) "⏎" }}
+                {{ if and $content $external }}
+                    {{ $text := or (.Param "paige.feeds.page_link" | markdownify) "⏎" }}
 
-                {{ $footer := printf `<p><a href="%s" title="%s">%s</a></p>` .Permalink (htmlEscape .Title) $text | safeHTML }}
-
-                {{ $content = print $content $footer }}
-            {{ end }}
+                    {{ $footer := printf `<p><a href="%s" title="%s">%s</a></p>` .Permalink (htmlEscape .Title) $text | safeHTML }}
 
-            {{ if not $content }}
-                {{ $content = markdownify .Description }}
-            {{ end }}
-
-            {{ if not $title }}
-                {{ warnf "layouts/_default/list.atom.xml: Page %s does not have a title. The atom output requires a title. Either set the page's title parameter, or disable the atom output." .RelPermalink }}
-            {{ end }}
+                    {{ $content = print $content $footer }}
+                {{ end }}
 
-            {{ if .Lastmod.IsZero }}
-                {{ warnf "layouts/_default/list.atom.xml: Page %s does not have a modified date. The atom output requires a modified date. Either set the page's date parameter, or set the page's paige.feeds.exclude parameter to true, or disable the atom output." .RelPermalink }}
-            {{ end }}
+                {{ if not $content }}
+                    {{ $content = markdownify .Description }}
+                {{ end }}
 
-            {{ with partial "paige/func-authors.html" . }}
-                {{ range . }}
-                    <author>
-                        {{ with .Params.paige.author.email }}
-                            <email>{{ . }}</email>
-                        {{ end }}
+                {{ if not $title }}
+                    {{ warnf "layouts/_default/list.atom.xml: Page %s does not have a title. The atom output requires a title. Either set the page's title parameter, or disable the atom output." .RelPermalink }}
+                {{ end }}
 
-                        {{ with .Params.paige.author.name }}
-                            <name>{{ . }}</name>
-                        {{ end }}
+                {{ if .Lastmod.IsZero }}
+                    {{ warnf "layouts/_default/list.atom.xml: Page %s does not have a modified date. The atom output requires a modified date. Either set the page's date parameter, or set the page's paige.feeds.exclude parameter to true, or disable the atom output." .RelPermalink }}
+                {{ end }}
 
-                        {{ with .Params.paige.author.url }}
-                            <uri>{{ . }}</uri>
-                        {{ end }}
-                    </author>
+                {{ with partial "paige/func-authors.html" . }}
+                    {{ range . }}
+                        <author>
+                            {{ with .Params.paige.author.email }}
+                                <email>{{ . }}</email>
+                            {{ end }}
+
+                            {{ with .Params.paige.author.name }}
+                                <name>{{ . }}</name>
+                            {{ end }}
+
+                            {{ with .Params.paige.author.url }}
+                                <uri>{{ . }}</uri>
+                            {{ end }}
+                        </author>
+                    {{ end }}
                 {{ end }}
-            {{ end }}
 
-            {{ with $content }}
-                <content type="html">{{ printf "<![CDATA[%s]]>" . | safeHTML }}</content>
-            {{ end }}
+                {{ with $content }}
+                    <content type="html">{{ printf "<![CDATA[%s]]>" . | safeHTML }}</content>
+                {{ end }}
 
-            <id>{{ $id }}</id>
+                <id>{{ $id }}</id>
 
-            {{ range .OutputFormats }}
-                {{ $rel := cond (eq .Rel "canonical") "alternate" .Rel }}
+                {{ range .OutputFormats }}
+                    {{ $rel := cond (eq .Rel "canonical") "alternate" .Rel }}
 
-                {{ if or (eq $rel "alternate") (eq $rel "enclosure") (eq $rel "related") (eq $rel "via") }}
-                    {{ $href := cond (and (eq $rel "alternate") (eq .MediaType.Type "text/html")) $link .Permalink }}
+                    {{ if or (eq $rel "alternate") (eq $rel "enclosure") (eq $rel "related") (eq $rel "via") }}
+                        {{ $href := cond (and (eq $rel "alternate") (eq .MediaType.Type "text/html")) $link .Permalink }}
 
-                    <link href="{{ $href }}" rel="{{ $rel }}" type="{{ .MediaType }}"/>
+                        <link href="{{ $href }}" rel="{{ $rel }}" type="{{ .MediaType }}"/>
+                    {{ end }}
                 {{ end }}
-            {{ end }}
 
-            {{ range $t := .Translations }}
-                {{ range .OutputFormats }}
-                    {{ if or (eq .Rel "alternate") (eq .Rel "enclosure") (eq .Rel "related") (eq .Rel "via") }}
-                        <link href="{{ .Permalink }}" hreflang="{{ $t.Lang }}" rel="{{ .Rel }}" type="{{ .MediaType }}"/>
+                {{ range $t := .Translations }}
+                    {{ range .OutputFormats }}
+                        {{ if or (eq .Rel "alternate") (eq .Rel "enclosure") (eq .Rel "related") (eq .Rel "via") }}
+                            <link href="{{ .Permalink }}" hreflang="{{ $t.Lang }}" rel="{{ .Rel }}" type="{{ .MediaType }}"/>
+                        {{ end }}
                     {{ end }}
                 {{ end }}
-            {{ end }}
 
-            {{ with $published }}
-                <published>{{ . }}</published>
-            {{ end }}
+                {{ with $published }}
+                    <published>{{ . }}</published>
+                {{ end }}
 
-            {{ with $rights }}
-                <rights type="html">{{ printf "<![CDATA[%s]]>" . | safeHTML }}</rights>
-            {{ end }}
+                {{ with $rights }}
+                    <rights type="html">{{ printf "<![CDATA[%s]]>" . | safeHTML }}</rights>
+                {{ end }}
 
-            {{ with $summary }}
-                <summary type="html">{{ printf "<![CDATA[%s]]>" . | safeHTML }}</summary>
-            {{ end }}
+                {{ with $summary }}
+                    <summary type="html">{{ printf "<![CDATA[%s]]>" . | safeHTML }}</summary>
+                {{ end }}
 
-            {{ printf `<title type="html"><![CDATA[%s]]></title>` $title | safeHTML }}
+                {{ printf `<title type="html"><![CDATA[%s]]></title>` $title | safeHTML }}
 
-            <updated>{{ $lastmod }}</updated>
-        </entry>
+                <updated>{{ $lastmod }}</updated>
+            </entry>
+        {{ end }}
     {{ end }}
 </feed>
diff --git a/layouts/_default/list.rss.xml b/layouts/_default/list.rss.xml
index 9f38da61..8b8af285 100644
--- a/layouts/_default/list.rss.xml
+++ b/layouts/_default/list.rss.xml
@@ -8,16 +8,10 @@
 {{ $limit := site.Config.Services.RSS.Limit }}
 {{ $link := ($page.AlternativeOutputFormats.Get "html").Permalink }}
 {{ $master := $page.Param "paige.feeds.rss.web_master" }}
-{{ $subpages := slice }}
+{{ $subpages := $page.RegularPagesRecursive.ByPublishDate.Reverse }}
 
 {{ $lastmod := site.Lastmod.Format $date }}
 
-{{ range $page.RegularPagesRecursive.ByPublishDate.Reverse }}
-    {{ if not (.Param "paige.exclude_feeds") }}
-        {{ $subpages = $subpages | append . }}
-    {{ end }}
-{{ end }}
-
 {{ if gt $limit 0 }}
     {{ $subpages = $subpages | first $limit }}
 {{ end }}
@@ -87,68 +81,70 @@
         {{ end }}
 
         {{ range $subpages }}
-            <item>
-                {{ $author := "" }}
-                {{ $authors := partial "paige/func-authors.html" . }}
-                {{ $description := .Content }}
-                {{ $external := and .Params.link (not (.Param "paige.feeds.disable_link")) | not | not }}
-                {{ $guid := printf "tag:%s,%s:%s" (urls.Parse site.BaseURL).Host (.PublishDate.Format "2006-01-02") (cond (.Params.id | not) .RelPermalink .Params.id) }}
-                {{ $published := .PublishDate.Format $date }}
-                {{ $title := .Title | markdownify | plainify | htmlUnescape }}
-
-                {{ $link := cond $external .Params.link .Permalink }}
-
-                {{ with $authors }}
-                    {{ $primary := index . 0 }}
-
-                    {{ if and $primary.Params.paige.author.email $primary.Params.paige.author.name }}
-                        {{ $author = printf "%s (%s)" $primary.Params.paige.author.email $primary.Params.paige.author.name }}
-                    {{ else if $primary.Params.email }}
-                        {{ $author = $primary.Params.email }}
+            {{ if not (.Param "paige.exclude_feeds") }}
+                <item>
+                    {{ $author := "" }}
+                    {{ $authors := partial "paige/func-authors.html" . }}
+                    {{ $description := .Content }}
+                    {{ $external := and .Params.link (not (.Param "paige.feeds.disable_link")) | not | not }}
+                    {{ $guid := printf "tag:%s,%s:%s" (urls.Parse site.BaseURL).Host (.PublishDate.Format "2006-01-02") (cond (.Params.id | not) .RelPermalink .Params.id) }}
+                    {{ $published := .PublishDate.Format $date }}
+                    {{ $title := .Title | markdownify | plainify | htmlUnescape }}
+
+                    {{ $link := cond $external .Params.link .Permalink }}
+
+                    {{ with $authors }}
+                        {{ $primary := index . 0 }}
+
+                        {{ if and $primary.Params.paige.author.email $primary.Params.paige.author.name }}
+                            {{ $author = printf "%s (%s)" $primary.Params.paige.author.email $primary.Params.paige.author.name }}
+                        {{ else if $primary.Params.email }}
+                            {{ $author = $primary.Params.email }}
+                        {{ end }}
                     {{ end }}
-                {{ end }}
 
-                {{ if and $description $external }}
-                    {{ $text := or (.Param "paige.feeds.page_link" | markdownify) "⏎" }}
+                    {{ if and $description $external }}
+                        {{ $text := or (.Param "paige.feeds.page_link" | markdownify) "⏎" }}
 
-                    {{ $footer := printf `<p><a href="%s" title="%s">%s</a></p>` .Permalink (htmlEscape $title) $text | safeHTML }}
+                        {{ $footer := printf `<p><a href="%s" title="%s">%s</a></p>` .Permalink (htmlEscape $title) $text | safeHTML }}
 
-                    {{ $description = print $description $footer }}
-                {{ end }}
+                        {{ $description = print $description $footer }}
+                    {{ end }}
 
-                {{ if not $description }}
-                    {{ $description = .Description | markdownify }}
-                {{ end }}
+                    {{ if not $description }}
+                        {{ $description = .Description | markdownify }}
+                    {{ end }}
 
-                {{ $description = replaceRE `<a href="#fn:(\d+)" class="footnote-ref" role="doc-noteref">` (printf `<a href="%s#fn:$1" class="footnote-ref" role="doc-noteref">` .Permalink) $description }}
-                {{ $description = replaceRE `<a href="#fnref:(\d+)" class="footnote-backref" role="doc-backlink">` (printf `<a href="%s#fnref:$1" class="footnote-backref" role="doc-backlink">` .Permalink) $description }}
+                    {{ $description = replaceRE `<a href="#fn:(\d+)" class="footnote-ref" role="doc-noteref">` (printf `<a href="%s#fn:$1" class="footnote-ref" role="doc-noteref">` .Permalink) $description }}
+                    {{ $description = replaceRE `<a href="#fnref:(\d+)" class="footnote-backref" role="doc-backlink">` (printf `<a href="%s#fnref:$1" class="footnote-backref" role="doc-backlink">` .Permalink) $description }}
 
-                {{ if and (not $description) (not $title) }}
-                    {{ warnf "layouts/_default/rss.xml: Page %s does not have a title or description. The rss output requires a title or description. Either set the page's title or description parameters, or disable the rss output." .RelPermalink }}
-                {{ end }}
+                    {{ if and (not $description) (not $title) }}
+                        {{ warnf "layouts/_default/rss.xml: Page %s does not have a title or description. The rss output requires a title or description. Either set the page's title or description parameters, or disable the rss output." .RelPermalink }}
+                    {{ end }}
 
-                {{ with $author }}
-                    <author>{{ . }}</author>
-                {{ end }}
+                    {{ with $author }}
+                        <author>{{ . }}</author>
+                    {{ end }}
 
-                {{ with $description }}
-                    <description>{{ printf "<![CDATA[%s]]>" . | safeHTML }}</description>
-                {{ end }}
+                    {{ with $description }}
+                        <description>{{ printf "<![CDATA[%s]]>" . | safeHTML }}</description>
+                    {{ end }}
 
-                <guid isPermaLink="false">{{ $guid }}</guid>
+                    <guid isPermaLink="false">{{ $guid }}</guid>
 
-                {{ with $link }}
-                    <link>{{ . }}</link>
-                {{ end }}
+                    {{ with $link }}
+                        <link>{{ . }}</link>
+                    {{ end }}
 
-                {{ with $published }}
-                    <pubDate>{{ . }}</pubDate>
-                {{ end }}
+                    {{ with $published }}
+                        <pubDate>{{ . }}</pubDate>
+                    {{ end }}
 
-                {{ with $title }}
-                    <title>{{ . }}</title>
-                {{ end }}
-            </item>
+                    {{ with $title }}
+                        <title>{{ . }}</title>
+                    {{ end }}
+                </item>
+            {{ end }}
         {{ end }}
     </channel>
 </rss>