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 2fc953516f..3670aad035 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
@@ -17,15 +17,15 @@
 DROP TABLE IF EXISTS entity_views;
 
 CREATE TABLE IF NOT EXISTS entity_views (
-    id varchar(31) NOT NULL CONSTRAINT entity_views_pkey PRIMARY KEY,
-    additional_info varchar,
+    id varchar(31) NOT NULL CONSTRAINT entity_view_pkey PRIMARY KEY,
+    entity_id varchar(31),
+    entity_type varchar(255),
+    tenant_id varchar(31),
     customer_id varchar(31),
+    name varchar(255),
     keys varchar(255),
     ts_begin varchar(255),
     ts_end varchar(255),
-    name varchar(255),
     search_text varchar(255),
-    entity_id varchar(31),
-    entity_type varchar(255),
-    tenant_id varchar(31)
+    additional_info varchar
 );
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 03fce40cea..813a9acd08 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
@@ -38,7 +38,7 @@ public class EntityView extends SearchTextBasedWithAdditionalInfo<EntityViewId>
     private TenantId tenantId;
     private CustomerId customerId;
     private String name;
-    private TelemetryEntityView keys; //To Do: Changed from all code
+    private TelemetryEntityView keys;
     private Long tsBegin;
     private Long tsEnd;
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/objects/AttributesEntityView.java b/common/data/src/main/java/org/thingsboard/server/common/data/objects/AttributesEntityView.java
index 1c32579b72..b1d270c934 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/objects/AttributesEntityView.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/objects/AttributesEntityView.java
@@ -44,4 +44,9 @@ public class AttributesEntityView {
     public AttributesEntityView(AttributesEntityView obj) {
         this(obj.getCs(), obj.getSs(), obj.getSh());
     }
+
+    @Override
+    public String toString() {
+        return "{cs=" + cs + ", ss=" + ss + ", sh=" + sh + '}';
+    }
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/objects/TelemetryEntityView.java b/common/data/src/main/java/org/thingsboard/server/common/data/objects/TelemetryEntityView.java
index c899c65590..e7398e6500 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/objects/TelemetryEntityView.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/objects/TelemetryEntityView.java
@@ -40,4 +40,9 @@ public class TelemetryEntityView {
     public TelemetryEntityView(TelemetryEntityView obj) {
         this(obj.getTimeseries(), obj.getAttributes());
     }
+
+    @Override
+    public String toString() {
+        return "{timeseries=" + timeseries + ", attributes=" + attributes + '}';
+    }
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
index 4a42577044..6554083fe4 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
@@ -213,7 +213,7 @@ public class EntityViewServiceImpl extends AbstractEntityService
 
                 @Override
                 protected void validateDataImpl(EntityView entityView) {
-                    if (StringUtils.isEmpty(String.join("", entityView.getKeys()))) {
+                    if (StringUtils.isEmpty(entityView.getKeys().toString())) {
                         throw new DataValidationException("Entity view type should be specified!");
                     }
                     if (StringUtils.isEmpty(entityView.getName())) {
@@ -272,6 +272,5 @@ public class EntityViewServiceImpl extends AbstractEntityService
         protected void removeEntity(EntityView entity) {
             unassignEntityViewFromCustomer(new EntityViewId(entity.getUuidId()));
         }
-
     }
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityViewEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityViewEntity.java
index 62e9eb3e78..1175fac864 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityViewEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityViewEntity.java
@@ -51,6 +51,10 @@ public class EntityViewEntity extends BaseSqlEntity<EntityView> implements Searc
     @Column(name = ModelConstants.ENTITY_VIEW_ENTITY_ID_PROPERTY)
     private String entityId;
 
+    @Enumerated(EnumType.STRING)
+    @Column(name = ENTITY_TYPE_PROPERTY)
+    private EntityType entityType;
+
     @Column(name = ModelConstants.ENTITY_VIEW_TENANT_ID_PROPERTY)
     private String tenantId;
 
@@ -60,10 +64,6 @@ public class EntityViewEntity extends BaseSqlEntity<EntityView> implements Searc
     @Column(name = ModelConstants.ENTITY_VIEW_NAME_PROPERTY)
     private String name;
 
-    @Enumerated(EnumType.STRING)
-    @Column(name = ENTITY_TYPE_PROPERTY)
-    private EntityType entityType;
-
     @Column(name = ModelConstants.ENTITY_VIEW_KEYS_PROPERTY)
     private String keys;
 
diff --git a/dao/src/main/resources/sql/schema.sql b/dao/src/main/resources/sql/schema.sql
index b79b61f3af..ed3583cef3 100644
--- a/dao/src/main/resources/sql/schema.sql
+++ b/dao/src/main/resources/sql/schema.sql
@@ -254,14 +254,14 @@ CREATE TABLE IF NOT EXISTS rule_node (
 
 CREATE TABLE IF NOT EXISTS entity_views (
     id varchar(31) NOT NULL CONSTRAINT entity_view_pkey PRIMARY KEY,
-    additional_info varchar,
+    entity_id varchar(31),
+    entity_type varchar(255),
+    tenant_id varchar(31),
     customer_id varchar(31),
+    name varchar(255),
     keys varchar(255),
     ts_begin varchar(255),
     ts_end varchar(255),
-    name varchar(255),
-    entity_type varchar(255),
     search_text varchar(255),
-    entity_id varchar(31),
-    tenant_id varchar(31)
+    additional_info varchar
 );