diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html
index 4a7b1220cd..aa419eaac6 100644
--- a/layouts/_default/archives.html
+++ b/layouts/_default/archives.html
@@ -2,8 +2,8 @@
 
 <div class="archive">
   <header class="page-header"><h1>{{ .Title }}</h1></header>
-
-  {{ range .Site.RegularPages.GroupByPublishDate "2006" }}
+  {{ $pages := where site.RegularPages "Type" "in" site.Params.mainSections }}
+  {{ range $pages.GroupByPublishDate "2006" }}
   {{ if ne .Key "0001" }}
   <div class="archive-year">
     <h2 class="archive-year-header">{{ replace .Key "0001" "" }}</h2>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index c00e02f91e..ecb3f8d011 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -4,20 +4,20 @@
 {{- partial "indexProfile.html" . }}
 {{else}} {{/* if not profileMode */}}
 
-{{ $isntDefault := not (or (eq (trim $.Site.Params.contentTypeName " ") "posts") (eq (trim $.Site.Params.contentTypeName " ") "")) }}
-{{ $contentTypeName := cond $isntDefault (string $.Site.Params.contentTypeName) "posts" }}
-
-{{ $PageContext := . }}
-{{ if .IsHome }}
-{{ $PageContext = .Site }}
-{{else}}
-{{- if .Title }}
+{{- if not .IsHome | and .Title }}
 <header class="page-header">
   <h1>{{ .Title }}</h1>
 </header>
 {{ end }}
-{{ end }}
-{{ $paginator := .Paginate (where $PageContext.RegularPages "Type" $contentTypeName) }}
+
+
+{{ $pages := .RegularPages }}
+
+{{ if .IsHome }}
+{{ $pages = where site.RegularPages "Type" "in" site.Params.mainSections }}
+{{end}}
+
+{{ $paginator := .Paginate $pages }}
 
 {{- range $index, $page := $paginator.Pages }}