diff --git a/core/misc/autocomplete.js b/core/misc/autocomplete.js
index f826281..218fd53 100644
--- a/core/misc/autocomplete.js
+++ b/core/misc/autocomplete.js
@@ -179,8 +179,8 @@
    */
   function renderItem(ul, item) {
     return $("<li>")
-      .append($("<a>").html(item.label))
-      .appendTo(ul);
+      .append( $("<div>").html(item.label))
+      .appendTo( ul );
   }
 
   /**
diff --git a/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php b/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php
index 25e7393..a7ae8d9 100644
--- a/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php
+++ b/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php
@@ -153,7 +153,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;