diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityKeyMapping.java b/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityKeyMapping.java
index 74a8596d3f..75be3610db 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityKeyMapping.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityKeyMapping.java
@@ -406,7 +406,7 @@ public class EntityKeyMapping {
             String entityFieldAlias = getEntityFieldAlias(filterType, entityType);
             String column = null;
             if (existingEntityFields.contains(entityFieldAlias)) {
-                column = entityFieldColumnMap.get(key.getKey());
+                column = entityFieldColumnMap.get(entityFieldAlias);
             }
             if (column != null) {
                 String field = alias + "." + column;
diff --git a/ui-ngx/package-lock.json b/ui-ngx/package-lock.json
index 7def972724..b9d50ac759 100644
--- a/ui-ngx/package-lock.json
+++ b/ui-ngx/package-lock.json
@@ -8997,10 +8997,10 @@
       "integrity": "sha512-4O3GWAYJaauMCILm07weko2rHA8a4kjn7+8Lg4s1d7SxwS/3IpkVD/GljbRrIJ1c1W/XGJ3GbuK7RyYZEJChhw=="
     },
     "ngx-flowchart": {
-      "version": "git://github.com/thingsboard/ngx-flowchart.git#a4157b0eef2eb3646ef920447c7b06b39d54f87f",
+      "version": "git://github.com/thingsboard/ngx-flowchart.git#7a02f4748b5e7821a883c903107af5f20415d026",
       "from": "git://github.com/thingsboard/ngx-flowchart.git#master",
       "requires": {
-        "tslib": "^1.10.0"
+        "tslib": "^1.13.0"
       },
       "dependencies": {
         "tslib": {