diff --git a/html/css/styles.css b/html/css/styles.css
index a7af6bfa7..94697ff52 100644
--- a/html/css/styles.css
+++ b/html/css/styles.css
@@ -1626,7 +1626,7 @@ tr.search:nth-child(odd) {
   left: -400px !important;
   margin-bottom: 20px;
   overflow: hidden;
-  padding: 5px;
+  padding: 8px;
   background-color: #fff;
   -webkit-border-radius: 8px;
      -moz-border-radius: 8px;
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 1b9c4b281..dc5f65e91 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -553,7 +553,7 @@ if ($_SESSION['authenticated'])
 </nav>
 <script>
 var devices = new Bloodhound({
-  datumTokenizer: Bloodhound.tokenizers.obj.whitespace('device_id'),
+  datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'),
   queryTokenizer: Bloodhound.tokenizers.whitespace,
   remote: {
       url: "ajax_search.php?search=%QUERY&type=device",
@@ -639,7 +639,8 @@ $('#gsearch').typeahead({
 {
   source: devices.ttAdapter(),
   async: true,
-  display: name,
+  display: 'name',
+  valueKey: 'name',
     templates: {
         header: '<h5><strong>&nbsp;Devices</strong></h5>',
         suggestion: Handlebars.compile('<p><a href="{{url}}"><img src="{{device_image}}" border="0"> <small><strong>{{name}}</strong> | {{device_os}} | {{version}} | {{device_hardware}} with {{device_ports}} port(s) | {{location}}</small></a></p>')
@@ -648,7 +649,8 @@ $('#gsearch').typeahead({
 {
   source: ports.ttAdapter(),
   async: true,
-  display: name,
+  display: 'name',
+  valueKey: 'name',
     templates: {
         header: '<h5><strong>&nbsp;Ports</strong></h5>',
         suggestion: Handlebars.compile('<p><a href="{{url}}"><small><img src="images/icons/port.png" /> <strong>{{name}}</strong> – {{hostname}}<br /><i>{{description}}</i></small></a></p>')
@@ -657,7 +659,8 @@ $('#gsearch').typeahead({
 {
   source: bgp.ttAdapter(),
   async: true,
-  display: name,
+  display: 'name',
+  valueKey: 'name',
     templates: {
         header: '<h5><strong>&nbsp;BGP Sessions</strong></h5>',
         suggestion: Handlebars.compile('<p><a href="{{url}}"><small><img src="{{bgp_image}}" border="0">{{name}} - {{hostname}}<br />AS{{localas}} -> AS{{remoteas}}</small></a></p>')