diff --git a/core/misc/autocomplete.js b/core/misc/autocomplete.js
index 66e820d..b348052 100644
--- a/core/misc/autocomplete.js
+++ b/core/misc/autocomplete.js
@@ -164,7 +164,7 @@
    */
   function renderItem (ul, item) {
     return $("<li>")
-      .append( $("<a>").html(item.label))
+      .append( $("<div>").html(item.label))
       .appendTo( ul );
   }
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php b/core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php
index 05e97d9..71e4ae9 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php
@@ -169,7 +169,7 @@ public function getReferenceableEntities($match = NULL, $match_operator = 'CONTA
     if ($result) {
       foreach($this->view->result as $row) {
         $entity = $row->_entity;
-        $return[$entity->bundle()][$entity->id()] = $entity->label();
+        $return[$entity->bundle()][$entity->id()] = $result[$entity->id()];
       }
     }
     return $return;