diff --git a/common/edqs/src/main/java/org/thingsboard/server/edqs/data/BaseEntityData.java b/common/edqs/src/main/java/org/thingsboard/server/edqs/data/BaseEntityData.java
index 21b9ff0c4f..487c534778 100644
--- a/common/edqs/src/main/java/org/thingsboard/server/edqs/data/BaseEntityData.java
+++ b/common/edqs/src/main/java/org/thingsboard/server/edqs/data/BaseEntityData.java
@@ -20,6 +20,7 @@ import lombok.Setter;
 import lombok.ToString;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.edqs.fields.EntityFields;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.permission.QueryContext;
@@ -139,11 +140,32 @@ public abstract class BaseEntityData<T extends EntityFields> implements EntityDa
             case "name" -> getEntityName();
             case "ownerName" -> getOwnerName();
             case "ownerType" -> getOwnerType();
+            case "displayName" -> getDisplayName();
             case "entityType" -> Optional.ofNullable(getEntityType()).map(EntityType::name).orElse("");
             default -> fields.getAsString(name);
         };
     }
 
+    public String getDisplayName(){
+        return switch (getEntityType()) {
+            case DEVICE, ASSET -> StringUtils.isNotEmpty(fields.getLabel()) ? fields.getLabel() : fields.getName();
+            case USER -> {
+                boolean firstNameSet = StringUtils.isNotEmpty(fields.getFirstName());
+                boolean lastNameSet = StringUtils.isNotEmpty(fields.getLastName());
+                if(firstNameSet && lastNameSet) {
+                    yield fields.getFirstName() + " " + fields.getLastName();
+                } else if(firstNameSet) {
+                    yield fields.getFirstName();
+                } else if  (lastNameSet) {
+                    yield fields.getLastName();
+                } else {
+                    yield fields.getEmail();
+                }
+            }
+            default -> fields.getName();
+        };
+    }
+
     public String getEntityName() {
         return getFields().getName();
     }
diff --git a/common/edqs/src/main/java/org/thingsboard/server/edqs/data/DeviceData.java b/common/edqs/src/main/java/org/thingsboard/server/edqs/data/DeviceData.java
index 3a3e5c5792..f47bfcb28a 100644
--- a/common/edqs/src/main/java/org/thingsboard/server/edqs/data/DeviceData.java
+++ b/common/edqs/src/main/java/org/thingsboard/server/edqs/data/DeviceData.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.edqs.data;
 import lombok.ToString;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.edqs.fields.DeviceFields;
 import org.thingsboard.server.common.data.query.EntityKeyType;
 import org.thingsboard.server.common.data.edqs.DataPoint;