diff --git a/_config.yml b/_config.yml
index d49dea9..c4b54f9 100644
--- a/_config.yml
+++ b/_config.yml
@@ -46,9 +46,17 @@ kramdown:
   input: GFM
   toc_levels: "1,2"
 
-algolia: # Search
+# Search
+algolia:
   application_id: HOJ487LP0L
+  # Which index the Travis job will create/update
+  # with the content of the current Jekyll site.
+  # The auth key for this is injected as secure env variable.
   index_name: qunitjs
+  files_to_exclude:
+    # Index destination instead of intermediary
+    - guides.md
+  # Auth key for client-side search queries.
   search_only_api_key: aed00982db05bd21dd05310be057bda8
 
 # Input files
diff --git a/_includes/search.html b/_includes/search.html
index 893f5cc..8056800 100644
--- a/_includes/search.html
+++ b/_includes/search.html
@@ -16,30 +16,64 @@
 <script>
     window.addEventListener('DOMContentLoaded', function setupSearch() {
         const client = algoliasearch('{{ site.algolia.application_id }}', '{{ site.algolia.search_only_api_key }}');
-        const index = client.initIndex('{{ site.algolia.index_name }}');
+        const indexMain = client.initIndex('{{ site.algolia.index_name }}');
+        const indexApi = client.initIndex('qunitjs-api');
         const autocompleteOptions = {
-            hint: false
+            hint: false,
+            ariaLabel: 'search input',
+            // Set debug to true if you want to inspect the dropdown
+            debug: true,
+            templates: {
+                // https://github.com/algolia/autocomplete.js/issues/248
+                empty(query) {
+                    return `No results for "${query.query}".`;
+                }
+            }
         };
+        function formatURL(suggestion) {
+            if (suggestion.anchor && suggestion.url.indexOf('#') === -1) {
+                return suggestion.url + '#' + suggestion.anchor;
+            } else {
+                return suggestion.url;
+            }
+        }
         const autocompleteSources = [
             {
-                source: autocomplete.sources.hits(index, { hitsPerPage: 5 }),
+                source: autocomplete.sources.hits(indexApi, { hitsPerPage: 5 }),
+                displayKey: '',
+                templates: {
+                    suggestion(suggestion) {
+                        const title = [ suggestion.title ].concat(suggestion.headings).join(' › ');
+                        const content = suggestion._highlightResult.content && suggestion._highlightResult.content.value || '';
+                        suggestion._href = 'https://api.qunitjs.com' + formatURL(suggestion);
+                        return `
+                            <a href="${suggestion._href}" tabindex="-1">
+                                <p class="aa-suggestion_title">${title}</p>
+                                <p class="aa-suggestion_content">${content}</p>
+                            </a>
+                        `;
+                    }
+                }
+            },
+            {
+                source: autocomplete.sources.hits(indexMain, { hitsPerPage: 5 }),
                 displayKey: '',
                 templates: {
                     suggestion(suggestion) {
+                        const title = [ suggestion.title ].concat(suggestion.headings).join(' › ');
+                        const content = suggestion._highlightResult.content && suggestion._highlightResult.content.value || '';
+                        suggestion._href = formatURL(suggestion);
                         return `
-                            <a href="${suggestion.url}" tabindex="-1">
-                                <p class="aa-suggestion_content">${suggestion._highlightResult.content.value}</p>
-                                <p class="aa-suggestion_meta">${suggestion.title}</p>
+                            <a href="${suggestion._href}" tabindex="-1">
+                                <p class="aa-suggestion_title">${title}</p>
+                                <p class="aa-suggestion_content">${content}</p>
                             </a>
                         `;
-                    },
-                    empty(query) {
-                        return `<div class="aa-empty">No results for "${query.query}".</div>`;
                     }
                 }
             }
         ];
         autocomplete('#aa-search-input', autocompleteOptions, autocompleteSources)
-            .on('autocomplete:selected', (event, suggestion) => window.location = suggestion.url);
+            .on('autocomplete:selected', (event, suggestion) => location.href = suggestion._href || suggestion.url);
     });
 </script>
diff --git a/css/styles.scss b/css/styles.scss
index e026280..650ff9e 100644
--- a/css/styles.scss
+++ b/css/styles.scss
@@ -14,6 +14,8 @@ $color-off-white: #eee;
 // https://brand.jquery.org/colors/#qunit-purple
 $color-brand: #9c3493; // bright purple  (primary)
 $color-accent: #390F39; // deep purple  (secondary)
+
+$color-darkgrey: #63676d; // based on 2015 api.jquery.com design
 $color-black: #333;
 
 $screen-s: 480px;
@@ -356,18 +358,24 @@ iframe {
 .aa-suggestion {
     padding: $size-spacing;
     cursor: pointer;
+    border-top: 1px solid $color-off-white;
     border-left: 2px solid transparent;
     border-right: 2px solid transparent;
     transition: background-color 0.2s, border-color 0.2s;
 
-    & + & {
-        border-top: 1px solid $color-off-white;
+    a {
+        // reset default link style
+        text-decoration: none;
     }
 
     &:hover,
     &.aa-cursor {
         background-color: rgba($color-off-white, 0.5);
         border-left: 2px solid $color-brand;
+
+        .aa-suggestion_title {
+            text-decoration: underline;
+        }
     }
 }
 
@@ -375,18 +383,21 @@ iframe {
     font-weight: bold;
 }
 
-.aa-suggestion_content,
-.aa-suggestion_meta {
-    margin-bottom: 0;
-    color: $color-black;
+.aa-suggestion_title,
+.aa-suggestion_content {
+    // reset paragraph margin
+    margin: 0;
+    // clip title chunks and content match  to one line
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
-
-.aa-suggestion_meta {
-    font-size: 0.8rem;
+.aa-suggestion_title {
     color: $color-brand;
-    border-top: 1px solid $color-off-white;
-    margin-top: 0.25rem;
-    padding-top: 0.25rem;
+}
+.aa-suggestion_content {
+    font-size: 0.8rem;
+    color: $color-darkgrey;
 }
 
 /* Mobile Toggle Controls */