diff --git a/assets/json/offline-search-index.json b/assets/json/offline-search-index.json
index 1ee051c64..8801f7d05 100644
--- a/assets/json/offline-search-index.json
+++ b/assets/json/offline-search-index.json
@@ -1,7 +1,6 @@
 {{- $.Scratch.Add "offline-search-index" slice -}}
-{{- range where site.AllPages ".Params.exclude_search" "!=" true -}}
-{{- /* We have to apply `htmlUnescape` again after `truncate` because `truncate` applies `html.EscapeString` if the argument is not HTML. */ -}}
-{{- /* Individual taxonomies can be added in the next line by add '"taxonomy-name" (.Params.taxonomy-name | default "")' to the dict (as seen for categories and tags). */ -}}
+{{- range hugo.Sites -}}
+{{- range where .Pages ".Params.exclude_search" "!=" true -}}
 {{- $.Scratch.Add
     "offline-search-index"
     (dict
@@ -15,4 +14,5 @@
     )
 -}}
 {{- end -}}
+{{- end -}}
 {{- $.Scratch.Get "offline-search-index" | jsonify -}}
diff --git a/layouts/_default/sitemap.xml b/layouts/_default/sitemap.xml
index 831681511..48f143806 100644
--- a/layouts/_default/sitemap.xml
+++ b/layouts/_default/sitemap.xml
@@ -1,7 +1,7 @@
 {{ printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML }}
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
   xmlns:xhtml="http://www.w3.org/1999/xhtml">
-  {{ range site.AllPages }}
+  {{ range site.Pages }}
   {{- if and (not .Params.sitemap_exclude) (not .Draft) }}
   <url>
     <loc>{{ .Permalink }}</loc>
diff --git a/package-lock.json b/package-lock.json
index 7d176ba2b..f37f86495 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
       "license": "Apache-2.0",
       "devDependencies": {
         "autoprefixer": "^10.4.19",
-        "hugo-extended": "0.157.0",
+        "hugo-extended": "0.158.0",
         "postcss-cli": "^11.0.0"
       }
     },
@@ -465,11 +465,12 @@
       "dev": true
     },
     "node_modules/hugo-extended": {
-      "version": "0.157.0",
-      "resolved": "https://registry.npmjs.org/hugo-extended/-/hugo-extended-0.157.0.tgz",
-      "integrity": "sha512-vjkR5TKK7mQcACYneext4D/YofJnfcHsFZzwItfevAOYoQUAZ+gUim3gwOLTImrTy8QdyzDtaF4/EHOhXEKWvg==",
+      "version": "0.158.0",
+      "resolved": "https://registry.npmjs.org/hugo-extended/-/hugo-extended-0.158.0.tgz",
+      "integrity": "sha512-cFl07JY5juYoik9wVZSZxBKVgSWQtmddTB1AhpOFetCZFR9PgN0cl/MQSX+cYho2kl8mquDdQ+4jzfP1KP0hmA==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "dependencies": {
         "adm-zip": "^0.5.16",
         "tar": "^7.5.9"
@@ -1396,9 +1397,9 @@
       "dev": true
     },
     "hugo-extended": {
-      "version": "0.157.0",
-      "resolved": "https://registry.npmjs.org/hugo-extended/-/hugo-extended-0.157.0.tgz",
-      "integrity": "sha512-vjkR5TKK7mQcACYneext4D/YofJnfcHsFZzwItfevAOYoQUAZ+gUim3gwOLTImrTy8QdyzDtaF4/EHOhXEKWvg==",
+      "version": "0.158.0",
+      "resolved": "https://registry.npmjs.org/hugo-extended/-/hugo-extended-0.158.0.tgz",
+      "integrity": "sha512-cFl07JY5juYoik9wVZSZxBKVgSWQtmddTB1AhpOFetCZFR9PgN0cl/MQSX+cYho2kl8mquDdQ+4jzfP1KP0hmA==",
       "dev": true,
       "requires": {
         "adm-zip": "^0.5.16",
diff --git a/package.json b/package.json
index 5e9404a49..a5056ca3e 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
   },
   "devDependencies": {
     "autoprefixer": "^10.4.19",
-    "hugo-extended": "0.157.0",
+    "hugo-extended": "0.158.0",
     "postcss-cli": "^11.0.0"
   }
 }