diff --git a/docs/search.json b/docs/search.json
index a31fc7334c..7cd8517bc9 100644
--- a/docs/search.json
+++ b/docs/search.json
@@ -3,11 +3,13 @@
 ---
 
 [
-    {% for page in site.pages %}
+{% assign sorted_pages = site.html_pages | sort: 'title' %}
+{% for page in sorted_pages %}
+    {% if page.title %}
         {
-            "title" : "{{ page.title | escape }}",
-            "url"   : "{{ site.baseurl }}{{ page.url }}",
-            "date"  : "{{ page.date }}"
+            "title" : {{ page.title | jsonify }},
+            "url"   : "{{ site.baseurl }}{{ page.url }}"
         } {% unless forloop.last %},{% endunless %}
-    {% endfor %}
+    {% endif %}
+{% endfor %}
 ]