thingsboard-memoizeit

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 2551183..e907676 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
@@ -136,7 +136,7 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti
         List<Object> list = new ArrayList<>();
         list.add(entityView.getTenantId());
         list.add(entityView.getName());
-        cache.evict(list);
+//        cache.evict(list);
         entityViewDao.removeById(entityViewId.getId());
     }
 

diff --git a/ui/src/app/entity-view/entity-view.directive.js b/ui/src/app/entity-view/entity-view.directive.js
index b07d437..4d4e84b 100644
--- a/ui/src/app/entity-view/entity-view.directive.js
+++ b/ui/src/app/entity-view/entity-view.directive.js
@@ -74,11 +74,11 @@ export default function EntityViewDirective($compile, $templateCache, $filter, t
         function updateMinMaxDates() {
             if (scope.endTs) {
                 scope.maxStartTs = angular.copy(new Date(scope.endTs.getTime() - 1000));
-                scope.entityView.endTs = $filter('date')(scope.endTs, 'yyyy-MM-dd HH:mm:ss');
+                scope.entityView.endTs = scope.endTs.getTime();
             }
             if (scope.startTs) {
                 scope.minEndTs = angular.copy(new Date(scope.startTs.getTime() + 1000));
-                scope.entityView.startTs = $filter('date')(scope.startTs, 'yyyy-MM-dd HH:mm:ss');
+                scope.entityView.startTs = scope.startTs.getTime();
             }
         }