diff --git a/hugo.yml b/hugo.yml
index c3b566d1e8..9997589a2c 100644
--- a/hugo.yml
+++ b/hugo.yml
@@ -39,6 +39,9 @@ outputs:
   home:
     - HTML
     - OpenSearch
+  page:
+    - HTML
+    - OpenSearch
 
 publishDir:             "_site"
 
diff --git a/site/layouts/_default/list.opensearch.xml b/site/layouts/_default/list.opensearch.xml
index 15258eb652..b41abeefc4 100644
--- a/site/layouts/_default/list.opensearch.xml
+++ b/site/layouts/_default/list.opensearch.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/">
   <ShortName>{{ .Site.Title }}</ShortName>
-  <Description>Search {{ .Site.Title }} documentation</Description>
+  <Description>Search {{ .Site.Title }} Documentation</Description>
   <InputEncoding>UTF-8</InputEncoding>
-  <Image type="image/x-icon" width="16" height="16">{{ (printf "/docs/%s/assets/img/favicons/favicon.ico" .Site.Params.docs_version) | absURL }}</Image>
-  <Url type="text/html" method="get" template="{{ (printf "/docs/%s/getting-started/introduction/" .Site.Params.docs_version) | absURL }}#search={searchTerms}"/>
+  <Image type="image/x-icon" width="16" height="16">{{ (urls.JoinPath "/docs" .Site.Params.docs_version "assets/img/favicons/favicon.ico") | absURL }}</Image>
+  <Url type="text/html" method="get" template="{{ "/" | absURL }}#search={searchTerms}"/>
 </OpenSearchDescription>