diff --git a/test/site/content-org/all-posts.org b/test/site/content-org/all-posts.org
index f5402a3..03cd3d8 100644
--- a/test/site/content-org/all-posts.org
+++ b/test/site/content-org/all-posts.org
@@ -2028,18 +2028,13 @@ But you can get it by =.Site.GetPage ...=. Here is an example ([[https://github.
 {{ $headless := .Site.GetPage "page" "some-headless-page" }}
 {{ $reusablePages := $headless.Resources.Match "sidebar-content*" }}
 {{ range $reusablePages }}
-{{ .Title }}
+    {{ .Title }}
 {{ end }}
 #+end_example
 
 There are many use cases of such headless page bundles:
 - Shared media galleries
 - Reusable page content "snippets"
-
------
-
-The content of *index* pages of headless page bundles will not be
-available through any means.
 *** Bundled page foo in the headless bundle
 :PROPERTIES:
 :EXPORT_FILE_NAME: foo
diff --git a/test/site/content/bundles/headless-page-bundle-x/index.md b/test/site/content/bundles/headless-page-bundle-x/index.md
index d750b25..b8777ab 100644
--- a/test/site/content/bundles/headless-page-bundle-x/index.md
+++ b/test/site/content/bundles/headless-page-bundle-x/index.md
@@ -20,7 +20,7 @@ But you can get it by `.Site.GetPage ...`. Here is an example ([ref](https://git
 {{ $headless := .Site.GetPage "page" "some-headless-page" }}
 {{ $reusablePages := $headless.Resources.Match "sidebar-content*" }}
 {{ range $reusablePages }}
-{{ .Title }}
+    {{ .Title }}
 {{ end }}
 ```
 
@@ -28,8 +28,3 @@ There are many use cases of such headless page bundles:
 
 -   Shared media galleries
 -   Reusable page content "snippets"
-
----
-
-The content of **index** pages of headless page bundles will not be
-available through any means.
diff --git a/test/site/layouts/_default/headless-bundle-single.html b/test/site/layouts/_default/headless-bundle-single.html
index 5b2f4d7..f2a22a9 100644
--- a/test/site/layouts/_default/headless-bundle-single.html
+++ b/test/site/layouts/_default/headless-bundle-single.html
@@ -10,45 +10,60 @@
 
 <div class="post">
     <h1 class="post-title">{{ .Title }}</h1>
-    {{ with .GitInfo }} <!-- To enable this, put "enableGitInfo = true" in your site config.toml -->
-        This test was created/modified in commit <a href="{{ $.Site.Params.source.url }}/commit/{{- .Hash -}}">
-        {{- .AbbreviatedHash -}}</a> "{{ .Subject }}" on <b>{{ dateFormat "2006-01-02" .AuthorDate }}</b>.
-    {{ end }}
-    <p>
-        {{ if .Params.categories }}
-            Categories:
-            {{ range .Params.categories }}
-                <a href="/categories/{{ . | urlize }}">{{ . }}</a>
-            {{ end }}
-        {{ end }}
-    </p>
-    <p>
-        {{ if .Params.tags }}
-            Tags:
-            {{ range .Params.tags }}
-                <a href="/tags/{{ . | urlize }}">{{ . }}</a>
+
+    <!-- Taxonomy debug -->
+    {{ $page := . }}
+    {{ with .Site.Taxonomies }}
+        {{ range $key,$_ := . }}
+            {{ with $page.Param $key }}
+                {{ $val := . }}
+                <p>
+                    {{ printf "<span style=\"font-variant: small-caps;\">%s</span>:" $key | safeHTML }}
+                    {{ with $.Site.GetPage "taxonomyTerm" $key }}
+                        {{ $taxonomy_page := . }}
+                        {{ range $val }}
+                            <a href="{{ printf "%s%s" $taxonomy_page.URL (. | urlize) }}">{{ . }}</a>
+                        {{ end }}
+                    {{ end }}
+                </p>
             {{ end }}
         {{ end }}
-    </p>
+    {{ end }}
+
     <p>
         {{ if .Params.draft }}
-            <hr>
+            <hr />
             <center><h2>This is a Draft</h2></center>
-            <hr>
+            <hr />
         {{ end }}
     </p>
+
+    {{ $layout_file := "headless-bundle-single.html" }}
+    Layout file:
+    <a href="{{ .Site.Params.source.url }}/tree/master/test/site/layouts/_default/{{ $layout_file }}">
+        <code>{{ $layout_file }}</code>
+    </a>
+
     {{ .Content }}
-    <hr>
-    <h2>Content from Headless Page Bundle</h2>
+    <hr />
+
     {{ $headless := .Site.GetPage "page" "headless-page-bundle-x" }}
-    {{ $reusablePages := $headless.Resources }}
-    {{ range $reusablePages }}
-        <h3>{{ .Title }}</h3>
-        {{ .Content }}
-        <hr>
-    {{ end }}
+
+    <h2>Content from Headless Bundle Index page</h2>
+    <h3>{{ $headless.Title }}</h3>
+    {{ $headless.Content }}
+    <h3 id="headless-bundle-params-debug">Headless Bundle Index Page Params (Debug)</h3>
+    {{ partial "debugprint.html" $headless.Params }}
+
     {{ with $headless.Resources }}
-        <h3 id="headless-resource-debug">Headless Page Bundle Resources (Debug)</h3>
+        <h2>Content from Headless Bundle page Resources</h2>
+        {{ range . }}
+            <h3>{{ .Title }}</h3>
+            {{ .Content }}
+            <hr />
+        {{ end }}
+
+        <h3 id="headless-bundle-resource-debug">Headless Bundle Resources (Debug)</h3>
         {{ partial "debugprint.html" . }}
     {{ end }}
 
diff --git a/test/site/themes/bare_min b/test/site/themes/bare_min
index cf2f43a..a236a51 160000
--- a/test/site/themes/bare_min
+++ b/test/site/themes/bare_min
@@ -1 +1 @@
-Subproject commit cf2f43a84de9426f0983bb277556c1a06db345fe
+Subproject commit a236a51f96275971cdbbb41e3e79d77566382eb5