diff --git a/assets/search-data.json b/assets/search-data.json
index 0348cbe..0a65bf0 100644
--- a/assets/search-data.json
+++ b/assets/search-data.json
@@ -1,6 +1,6 @@
 [
 {{- $pages := where .Site.Pages "Kind" "in" (slice "page" "section") -}}
-{{- $pages = where $pages "Params.booksearchexclude" "!=" true -}}
+{{- $pages = where $pages "Params.bookSearchExclude" "!=" true -}}
 {{/* Remove until we know why it does not work, see https://github.com/alex-shpak/hugo-book/issues/528 */}}
 {{/*- $pages = where $pages "Content" "not in" (slice nil "") -*/}}
 {{- $pages = where $pages "Content" "!=" "" -}}
diff --git a/layouts/partials/docs/footer.html b/layouts/partials/docs/footer.html
index 607f2aa..77e96d8 100644
--- a/layouts/partials/docs/footer.html
+++ b/layouts/partials/docs/footer.html
@@ -3,8 +3,7 @@
 {{ if and .GitInfo .Site.Params.BookRepo }}
   <div>
     {{- $date := partial "docs/date" (dict "Date" .GitInfo.AuthorDate.Local "Format" .Site.Params.BookDateFormat) -}}
-    {{- $commitPath := default "commit" .Site.Params.BookCommitPath -}}
-    <a class="flex align-center" href="{{ .Site.Params.BookRepo }}/{{ $commitPath }}/{{ .GitInfo.Hash }}" title='{{ i18n "Last modified by" }} {{ .GitInfo.AuthorName }} | {{ $date }}' target="_blank" rel="noopener">
+    <a class="flex align-center" href="{{ partial "docs/links/commit" . }}" title='{{ i18n "Last modified by" }} {{ .GitInfo.AuthorName }} | {{ $date }}' target="_blank" rel="noopener">
       <img src="{{ "svg/calendar.svg" | relURL }}" class="book-icon" alt="" />
       <span>{{ $date }}</span>
     </a>
@@ -13,8 +12,7 @@
 
 {{ if and .File .Site.Params.BookRepo .Site.Params.BookEditPath }}
   <div>
-    {{- $bookFilePath := (strings.TrimPrefix hugo.WorkingDir .Page.File.Filename | path.Join) -}}
-    <a class="flex align-center" href="{{ .Site.Params.BookRepo }}/{{ .Site.Params.BookEditPath }}{{ ($bookFilePath) }}" target="_blank" rel="noopener">
+    <a class="flex align-center" href="{{ partial "docs/links/edit" . }}" target="_blank" rel="noopener">
       <img src="{{ "svg/edit.svg" | relURL }}" class="book-icon" alt="" />
       <span>{{ i18n "Edit this page" }}</span>
     </a>
diff --git a/layouts/partials/docs/links/commit.html b/layouts/partials/docs/links/commit.html
new file mode 100644
index 0000000..8ab9334
--- /dev/null
+++ b/layouts/partials/docs/links/commit.html
@@ -0,0 +1,2 @@
+{{- $commitPath := default "commit" .Site.Params.BookCommitPath -}}
+{{- .Site.Params.BookRepo }}/{{ $commitPath }}/{{ .GitInfo.Hash -}}
\ No newline at end of file
diff --git a/layouts/partials/docs/links/edit.html b/layouts/partials/docs/links/edit.html
new file mode 100644
index 0000000..920affa
--- /dev/null
+++ b/layouts/partials/docs/links/edit.html
@@ -0,0 +1,2 @@
+{{- $bookFilePath := (strings.TrimPrefix hugo.WorkingDir .Page.File.Filename | path.Join) -}}
+{{- .Site.Params.BookRepo }}/{{ .Site.Params.BookEditPath }}{{ ($bookFilePath) -}}
\ No newline at end of file
diff --git a/layouts/partials/docs/menu-filetree.html b/layouts/partials/docs/menu-filetree.html
index edb150c..1494588 100644
--- a/layouts/partials/docs/menu-filetree.html
+++ b/layouts/partials/docs/menu-filetree.html
@@ -9,7 +9,7 @@
 
 {{ define "book-section-children" }}{{/* (dict "Section" .Section "CurrentPage" .CurrentPage) */}}
   <ul>
-    {{ range (where .Section.Pages "Params.bookhidden" "ne" true) }}
+    {{ range (where .Section.Pages "Params.bookHidden" "ne" true) }}
       {{ if .IsSection }}
         <li {{- if .Params.BookFlatSection }} class="book-section-flat" {{ end -}}>
           {{ template "book-page-link" (dict "Page" . "CurrentPage" $.CurrentPage) }}