diff --git a/404.html b/404.html
index 56efce4a39e6013188a311c8ac3fdd622b571adb..1e7a37ef8cdad11a67bfafabf2d668b18c294362 100644
--- a/404.html
+++ b/404.html
@@ -8,4 +8,4 @@ search_exclude: true
 
 <h1>Page not found</h1>
 
-<p>The page you requested could not be found. Try using the navigation {% if site.search_enabled %}or search {% endif %}to find what you're looking for or go to this <a href="{{ site.url }}{{ site.baseurl }}">site's home page</a>.</p>
+<p>The page you requested could not be found. Try using the navigation {% if site.search_enabled != false %}or search {% endif %}to find what you're looking for or go to this <a href="{{ '/' | absolute_url }}">site's home page</a>.</p>
diff --git a/_config.yml b/_config.yml
index c021b3578694cbfaf17757c165fcf6cf721f63ad..470fe5d095c7f62428552f8c71d37e99a0c75225 100644
--- a/_config.yml
+++ b/_config.yml
@@ -31,9 +31,7 @@ search:
   preview_words_before: 5
   preview_words_after: 10
   rel_url: false
-
-# Set the search token separator for hyphenated-word search:
-search_tokenizer_separator: /[\s/]+/
+  tokenizer_separator: /[\s/]+/ # Set the search token separator for hyphenated-word search
 
 # Enable or disable heading anchors
 heading_anchors: true
diff --git a/assets/js/just-the-docs.js b/assets/js/just-the-docs.js
index 0d2593ba4fa33730f1c94216148f291b0a6cd34f..e9b497c9c0a04da4398da58af5823c956cb88f2f 100644
--- a/assets/js/just-the-docs.js
+++ b/assets/js/just-the-docs.js
@@ -75,7 +75,7 @@ function initSearch() {
     if (request.status >= 200 && request.status < 400) {
       var docs = JSON.parse(request.responseText);
       
-      lunr.tokenizer.separator = {{ site.search_tokenizer_separator | default: "/[\s\-/]+/" }}
+      lunr.tokenizer.separator = {{ site.search.tokenizer_separator | default: site.search_tokenizer_separator | default: "/[\s\-/]+/" }}
 
       var index = lunr(function(){
         this.ref('id');