diff --git a/_layouts/default.html b/_layouts/default.html
index 3510c25e30dda7b667e093d3c64e20efae6601a3..9a04ac6c28db2529a8227639646ddfc0cb083292 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -51,8 +51,9 @@ layout: table_wrappers
       {% if site.doc_collections %}
         {% assign doc_collections_size = site.doc_collections | size %}
         {% for doc_collection in site.doc_collections %}
-          {% assign name = doc_collection.name %}
-          {% assign collection = site[doc_collection.collection] %}
+          {% assign collection_name = doc_collection[0] %}
+          {% assign collection = site[collection_name] %}
+          {% assign name = doc_collection[1].name %}
           {% if doc_collections_size > 1 %}
             <div class="nav-category">{{ name }}</div>
           {% endif %}
@@ -155,6 +156,9 @@ layout: table_wrappers
                   site.gh_edit_branch and
                   site.gh_edit_view_mode
                 %}
+                {{ site.github.repository_url }}
+                {{ site.github.source.branch }}
+                {{ site.github.source.path }}
                   <p class="text-small text-grey-dk-000 mb-0">
                     <a href="{{ site.gh_edit_repository }}/{{ site.gh_edit_view_mode }}/{{ site.gh_edit_branch }}/{{ page.path }}" id="edit-this-page">{{ site.gh_edit_link_text }}</a>
                   </p>
diff --git a/assets/js/zzzz-search-data.json b/assets/js/zzzz-search-data.json
index 6bc36e887e1642ba947eb66a1aa45aa885958003..05b393d654fbda4446f3edfb185eb5177b1bc1a7 100644
--- a/assets/js/zzzz-search-data.json
+++ b/assets/js/zzzz-search-data.json
@@ -7,7 +7,8 @@ permalink: /assets/js/search-data.json
 {%- assign pages_array = pages_array | push: site.html_pages -%}
 {%- if site.doc_collections -%}
   {%- for doc_collection in site.doc_collections -%}
-    {%- assign collection = site[doc_collection.collection] -%}
+    {% assign collection_name = doc_collection[0] %}
+    {% assign collection = site[collection_name] %}
     {%- assign pages_array = pages_array | push: collection -%}
   {%- endfor -%}
 {%- endif -%}
diff --git a/lib/tasks/search.rake b/lib/tasks/search.rake
index 73c0d5bf406824b60057ae8d3b17f06009020c04..5b656821449032b3aede5f59afb26aa2ad25985f 100644
--- a/lib/tasks/search.rake
+++ b/lib/tasks/search.rake
@@ -17,7 +17,8 @@ permalink: /assets/js/search-data.json
 {%- assign pages_array = pages_array | push: site.html_pages -%}
 {%- if site.doc_collections -%}
   {%- for doc_collection in site.doc_collections -%}
-    {%- assign collection = site[doc_collection.collection] -%}
+    {% assign collection_name = doc_collection[0] %}
+    {% assign collection = site[collection_name] %}
     {%- assign pages_array = pages_array | push: collection -%}
   {%- endfor -%}
 {%- endif -%}