diff --git a/docs/_isso/layout.html b/docs/_isso/layout.html
index c0f947689..668198079 100644
--- a/docs/_isso/layout.html
+++ b/docs/_isso/layout.html
@@ -1,26 +1,12 @@
 <!DOCTYPE html>
-{%- set url_root = pathto('', 1) %}
-{# XXX necessary? #}
-{%- if url_root == '#' %}{% set url_root = '' %}{% endif %}
 
 {%- macro script() %}
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '{{ url_root }}',
-        VERSION:     '{{ release|e }}',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '{{ '' if no_search_suffix else file_suffix }}',
-        HAS_SOURCE:  {{ has_source|lower }},
-        SOURCELINK_SUFFIX:  '{{ sourcelink_suffix }}'
-      };
-    </script>
-    {%- for scriptfile in script_files %}
-    <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
+    {%- for js in script_files %}
+    {{ js_tag(js) }}
     {%- endfor %}
 {%- endmacro %}
 
 {%- macro css() %}
-    <!--link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" /-->
     <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
     <link rel="stylesheet" href="{{ pathto('_static/css/site.css', 1) }}"/>
     {%- for cssfile in css_files %}
diff --git a/docs/_isso/search.html b/docs/_isso/search.html
index 1cd9cc8eb..86165039c 100644
--- a/docs/_isso/search.html
+++ b/docs/_isso/search.html
@@ -5,7 +5,7 @@ <h1>Search</h1>
     </header>
 {% endblock %}
 {% set title = _('Search') %}
-{% set script_files = script_files + ['_static/searchtools.js'] %}
+{% set script_files = script_files + ['_static/searchtools.js'] + ['_static/language_data.js'] %}
 {% block extrahead %}
   <script type="text/javascript">
     jQuery(function() { Search.loadIndex("{{ pathto('searchindex.js', 1) }}"); });
