diff --git a/layouts/partials/search/assets/js-resource.html b/layouts/partials/search/assets/js-resource.html
index 6fda54a1a92..b58f19cdba6 100644
--- a/layouts/partials/search/assets/js-resource.html
+++ b/layouts/partials/search/assets/js-resource.html
@@ -7,7 +7,10 @@
 {{- $years := slice }}
 {{- if default true site.Params.search.filter_years }}
   {{- $indexAllPages := default true .Site.Params.search.index_all_pages }}
-  {{- $pages := cond $indexAllPages .Site.AllPages .Site.AllRegularPages }}
+  {{- $pages := .Site.AllPages }}
+  {{- if not $indexAllPages }}
+    {{- $pages = where $pages "kind" "page" }}
+  {{- end }}
   {{- $pages = where $pages "Params.noindex" "ne" true }}
   {{- with $pages.GroupByDate "2006" }}
     {{- range . }}
diff --git a/layouts/partials/search/functions/search-index-hash.html b/layouts/partials/search/functions/search-index-hash.html
index 5ade9fcd7be..2ef58c16668 100644
--- a/layouts/partials/search/functions/search-index-hash.html
+++ b/layouts/partials/search/functions/search-index-hash.html
@@ -1,6 +1,6 @@
 {{/* This hashing function just calculate the number of pages and the lastmod time. */}}
 {{- $ctx := dict "Site" . }}
-{{- $pages := partialCached "search/functions/pages" $ctx $ctx -}}
+{{- $pages := partialCached "search/functions/pages" $ctx .Language.Lang -}}
 {{- $hash := printf "total=%d" $pages.Len }}
 {{- $latest := first 1 $pages.ByLastmod.Reverse }}
 {{- with index $latest 0 }}
diff --git a/layouts/partials/search/index.json.html b/layouts/partials/search/index.json.html
index 0ba16ed206e..e3291bad5a4 100644
--- a/layouts/partials/search/index.json.html
+++ b/layouts/partials/search/index.json.html
@@ -2,7 +2,7 @@
 {{- $indexContent := default false .Site.Params.search.index_content -}}
 {{- $years := true }}
 {{- $pagesCtx := dict "Site" .Site }}
-{{- $pages := partialCached "search/functions/pages" $pagesCtx $pagesCtx -}}
+{{- $pages := partialCached "search/functions/pages" $pagesCtx .Site.Language.Lang -}}
 {{- range $pages -}}
   {{- $page := . -}}
   {{- $item := newScratch -}}