thingsboard-developers

diff --git a/application/src/main/data/upgrade/2.1.1/schema_update.sql b/application/src/main/data/upgrade/2.1.1/schema_update.sql
index f4754e9..2fc9535 100644
--- a/application/src/main/data/upgrade/2.1.1/schema_update.sql
+++ b/application/src/main/data/upgrade/2.1.1/schema_update.sql
@@ -26,5 +26,6 @@ CREATE TABLE IF NOT EXISTS entity_views (
     name varchar(255),
     search_text varchar(255),
     entity_id varchar(31),
+    entity_type varchar(255),
     tenant_id varchar(31)
 );

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java b/common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java
index 102f6ee..03fce40 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java
@@ -20,9 +20,7 @@ import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityViewId;
 import org.thingsboard.server.common.data.id.TenantId;
-
-import java.beans.ConstructorProperties;
-import java.util.List;
+import org.thingsboard.server.common.data.objects.TelemetryEntityView;
 
 /**
  * Created by Victor Basanets on 8/27/2017.
@@ -40,7 +38,7 @@ public class EntityView extends SearchTextBasedWithAdditionalInfo<EntityViewId>
     private TenantId tenantId;
     private CustomerId customerId;
     private String name;
-    private List<String> keys;
+    private TelemetryEntityView keys; //To Do: Changed from all code
     private Long tsBegin;
     private Long tsEnd;
 

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java
index ed4cf2f..4e35c0b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java
@@ -57,6 +57,8 @@ public class EntityIdFactory {
                 return new RuleChainId(uuid);
             case RULE_NODE:
                 return new RuleNodeId(uuid);
+            case ENTITY_VIEW:
+                return new EntityViewId(uuid);
         }
         throw new IllegalArgumentException("EntityType " + type + " is not supported!");
     }