diff --git a/core/misc/autocomplete.js b/core/misc/autocomplete.js
index 5a1c156d0b..135f4489cf 100644
--- a/core/misc/autocomplete.js
+++ b/core/misc/autocomplete.js
@@ -200,8 +200,9 @@
    *   jQuery collection of the ul element.
    */
   function renderItem(ul, item) {
-    return $('<li>')
-      .append($('<a>').html(item.label))
+    return $("<li>")
+      .attr("data-value", item.value)
+      .append($("<a>").html(item.label.replace(new RegExp(this.term, 'i'), "<span class=\"autocomplete-search-term\">$&</span>")))
       .appendTo(ul);
   }