diff --git a/public/css/less/grafana.less b/public/css/less/grafana.less
index 3062ece1391..96a4b3c4b49 100644
--- a/public/css/less/grafana.less
+++ b/public/css/less/grafana.less
@@ -386,3 +386,7 @@
     padding: 80px 0;
   }
 }
+
+.typeahead strong {
+  color: @yellow;
+}
diff --git a/public/css/less/type.less b/public/css/less/type.less
index 1d833792484..0aeec228d6a 100644
--- a/public/css/less/type.less
+++ b/public/css/less/type.less
@@ -23,7 +23,7 @@ p {
 // Ex: 14px base font * 85% = about 12px
 small   { font-size: 85%; }
 
-strong  { font-weight: 500; }
+strong  { font-weight: bold; }
 em      { font-style: italic; color: @headingsColor; }
 cite    { font-style: normal; }
 
diff --git a/public/vendor/bootstrap/bootstrap.js b/public/vendor/bootstrap/bootstrap.js
index 62e23675410..2d9b83a4ba7 100644
--- a/public/vendor/bootstrap/bootstrap.js
+++ b/public/vendor/bootstrap/bootstrap.js
@@ -1993,9 +1993,12 @@
 
   , highlighter: function (item) {
       var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&')
+      if (!query) {
+        return item;
+      }
       return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) {
         return '<strong>' + match + '</strong>'
-      })
+      });
     }
 
   , render: function (items) {