diff --git a/documentation/themes/beastie/layouts/partials/menu.html b/documentation/themes/beastie/layouts/partials/menu.html
index 1b3ddf3b7d..e189abad53 100644
--- a/documentation/themes/beastie/layouts/partials/menu.html
+++ b/documentation/themes/beastie/layouts/partials/menu.html
@@ -1,35 +1,43 @@
-{{ with .Site.GetPage .Params.path }}
+{{/* always extract the first part of the path to match it only with the main document/book. */}}
+{{ $path := "" }}
+{{ $regex := `^(\/[^\/]+\/[^\/]+)` }}
+{{ $matches := findRE $regex .Params.path }}
+{{ if gt (len $matches) 0 }}
+  {{ $path = index $matches 0 }}
+{{ end }}
+
+{{ with .Site.GetPage $path }}
   <ul>
     {{ range .Pages }}
       <li>
         {{ if ne .Page.File.LogicalName "book.adoc" }}
 
           {{ $toc := htmlUnescape .Page.TableOfContents }}
           {{ $toc = replace $toc "<nav id=\"TableOfContents\">" "" }}
           {{ $toc = replace $toc "</nav>" "" }}
 
           <input type="checkbox" id="chapter-{{ md5 .Page }}" class="toggle" {{ if eq .Page.Permalink $.Permalink }} checked {{ end }} />
           <label {{ if gt (len $toc) 0 }} class="icon cursor" {{ end }} for="chapter-{{ md5 .Page }}"><a role="button"></a></label>
 
           {{ if $.Site.Params.isOnline }}
             {{ $finalPath := printf "%s%s" .Page.Permalink "#" }}
             <a href="{{ .Page.Permalink }}">
               {{ .Page.Title }}
             </a>
             {{ $toc = replace $toc "#" $finalPath }}
             {{ $toc | safeHTML }}
           {{ else }}
             {{ $chapterPath := printf "%s%s" .Page.Permalink "index.html" }}
             <a href="{{$chapterPath}}">
               {{ .Page.Title }}
             </a>
             {{ $chapterPath = replace $chapterPath "index.html" "index.html#" }}
             {{ $toc = replace $toc "#" $chapterPath }}
             {{ $toc | safeHTML }}
           {{ end }}
 
         {{ end }}
       </li>
     {{ end }}
   </ul>
 {{ end }}
diff --git a/documentation/themes/beastie/layouts/shortcodes/list-articles-directories.html b/documentation/themes/beastie/layouts/shortcodes/list-articles-directories.html
index 843300d4aa..33eab8f495 100644
--- a/documentation/themes/beastie/layouts/shortcodes/list-articles-directories.html
+++ b/documentation/themes/beastie/layouts/shortcodes/list-articles-directories.html
@@ -1,41 +1,17 @@
-{{ $articles := slice}}
-
-{{ range where .Site.Pages "Section" "articles" }}
-  {{ with .File }}
-    {{ $subDirsNumer := .File.Path | strings.Count "/" }}
-    {{ if eq $subDirsNumer 2 }}
-      {{ $articles  = $articles  | append (dict "page" . "path" .File.Path) }}
-    {{ end }}
-  {{ end }}
-{{ end }}
-
 {{ partial "global-search.html" . }}
 
 <h1>{{ i18n "articles" }}</h1>
 
 <p>{{ i18n "list-desc-articles" }}</p>
 
 <hr class="line"/>
 
-{{ $articles := slice}}
-
-{{ range where .Site.Pages "Section" "articles" }}
-  {{ $subDirsNumer := .File.Path | strings.Count "/" }}
-  {{ if eq $subDirsNumer 2 }}
-    {{ $articles  = $articles  | append (dict "page" . "path" .File.Path) }}
-  {{ end }}
-{{ end }}
-
 <ul class="documents-list">
-{{ range sort $articles "weight" "path" }}
-  {{ if in .path "_index.adoc" }}
-    {{ $articlePath := replaceRE "/_index.adoc" "" .path }}
-    {{ $articlePath = replaceRE "articles/" "" $articlePath }}
-    {{ $articleName := replaceRE "articles/" "" $articlePath }}
+{{ $articles := .Site.GetPage "section" "articles" }}
+{{ range $articles.Sections }}
     <li>
-      <a href="{{ $articlePath }}"><strong>{{ .page.Title }}</strong></a>
-      <p>{{ .page.Params.description }}</p>
+      <a href="{{ .Permalink }}"><strong>{{ .Title }}</strong></a>
+      <p>{{ .Params.description }}</p>
     </li>
-  {{ end }}
 {{ end }}
 </ul>
diff --git a/documentation/themes/beastie/layouts/shortcodes/list-books-directories.html b/documentation/themes/beastie/layouts/shortcodes/list-books-directories.html
index 10df5da34c..d98353f942 100644
--- a/documentation/themes/beastie/layouts/shortcodes/list-books-directories.html
+++ b/documentation/themes/beastie/layouts/shortcodes/list-books-directories.html
@@ -1,41 +1,18 @@
-{{ $books := slice}}
-
-{{ range where .Site.Pages "Section" "books" }}
-  {{ with .File }}
-    {{ $subDirsNumer := .File.Path | strings.Count "/" }}
-    {{ if eq $subDirsNumer 2 }}
-      {{ $books  = $books  | append (dict "page" . "path" .File.Path) }}
-    {{ end }}
-  {{ end }}
-{{ end }}
-
 {{ partial "global-search.html" . }}
 
 <h1>{{ i18n "books" }}</h1>
 
 <p>{{ i18n "list-desc-books" }}</p>
 
 <hr class="line"/>
 
-{{ $books := slice}}
-
-{{ range where .Site.Pages "Section" "books" }}
-  {{ $subDirsNumer := .File.Path | strings.Count "/" }}
-  {{ if eq $subDirsNumer 2 }}
-    {{ $books  = $books  | append (dict "page" . "path" .File.Path) }}
-  {{ end }}
-{{ end }}
-
 <ul class="documents-list">
-{{ range sort $books "bookOrder" "path" }}
-  {{ if in .path "_index.adoc" }}
-    {{ $bookPath := replaceRE "/_index.adoc" "" .path }}
-    {{ $bookPath = replaceRE "books/" "" $bookPath }}
-    {{ $articleName := replaceRE "books/" "" $bookPath }}
+
+{{ $books := .Site.GetPage "section" "books" }}
+{{ range $books.Sections }}
     <li>
-      <a href="{{ $bookPath }}"><strong>{{ .page.Title }}</strong></a>
-      <p>{{ .page.Params.description }}</p>
+      <a href="{{ .Permalink }}"><strong>{{ .Title }}</strong></a>
+      <p>{{ .Params.description }}</p>
     </li>
-  {{ end }}
 {{ end }}
 </ul>