diff --git a/src/Plugin/facets/processor/TranslateEntityProcessor.php b/src/Plugin/facets/processor/TranslateEntityProcessor.php
index ce33a97..93102a8 100644
--- a/src/Plugin/facets/processor/TranslateEntityProcessor.php
+++ b/src/Plugin/facets/processor/TranslateEntityProcessor.php
@@ -142,7 +142,7 @@ public function build(FacetInterface $facet, array $results) {
    */
   public function supportsFacet(FacetInterface $facet) {
     $data_definition = $facet->getDataDefinition();
-    if ($data_definition->getDataType() == "boolean") {
+    if ($data_definition->getDataType() === 'entity_reference') {
       return TRUE;
     }
     if (!($data_definition instanceof ComplexDataDefinitionInterface)) {
@@ -151,7 +151,7 @@ public function supportsFacet(FacetInterface $facet) {
 
     $property_definitions = $data_definition->getPropertyDefinitions();
     foreach ($property_definitions as $definition) {
-      if ($definition instanceof DataReferenceDefinitionInterface && $definition->getDataType() === 'entity_reference') {
+      if ($definition instanceof DataReferenceDefinitionInterface) {
         return TRUE;
       }
     }
diff --git a/src/Plugin/facets/processor/UidToUserNameCallbackProcessor.php b/src/Plugin/facets/processor/UidToUserNameCallbackProcessor.php
index 76ab37d..c3353be 100644
--- a/src/Plugin/facets/processor/UidToUserNameCallbackProcessor.php
+++ b/src/Plugin/facets/processor/UidToUserNameCallbackProcessor.php
@@ -45,9 +45,11 @@ public function build(FacetInterface $facet, array $results) {
    */
   public function supportsFacet(FacetInterface $facet) {
     $data_definition = $facet->getDataDefinition();
-    if ($data_definition->getDataType() == "boolean") {
+    if ($data_definition->getDataType() === 'entity_reference' &&
+      $data_definition->getTargetDefinition()->getConstraint('EntityType') === "user") {
       return TRUE;
     }
+
     if (!($data_definition instanceof ComplexDataDefinitionInterface)) {
       return FALSE;
     }