diff --git a/ui/src/app/entity-view/entity-view-fieldset.tpl.html b/ui/src/app/entity-view/entity-view-fieldset.tpl.html
index b9808e9cea..3894eb9d63 100644
--- a/ui/src/app/entity-view/entity-view-fieldset.tpl.html
+++ b/ui/src/app/entity-view/entity-view-fieldset.tpl.html
@@ -98,19 +98,19 @@
         <section layout="column">
             <section layout="row" layout-align="start start">
                 <mdp-date-picker ng-model="startTimeMs"
-                                 mdp-max-date="maxStartTimeTs"
+                                 mdp-max-date="maxStartTimeMs"
                                  mdp-placeholder="{{ 'entity-view.start-ts' | translate }}"></mdp-date-picker>
                 <mdp-time-picker ng-model="startTimeMs"
-                                 mdp-max-date="maxStartTimeTs"
+                                 mdp-max-date="maxStartTimeMs"
                                  mdp-placeholder="{{ 'entity-view.start-ts' | translate }}"
                                  mdp-auto-switch="true"></mdp-time-picker>
             </section>
             <section layout="row" layout-align="start start">
                 <mdp-date-picker ng-model="endTimeMs"
-                                 mdp-min-date="minEndTimeTs"
+                                 mdp-min-date="minEndTimeMs"
                                  mdp-placeholder="{{ 'entity-view.end-ts' | translate }}"></mdp-date-picker>
                 <mdp-time-picker ng-model="endTimeMs"
-                                 mdp-min-date="minEndTimeTs"
+                                 mdp-min-date="minEndTimeMs"
                                  mdp-placeholder="{{ 'entity-view.end-ts' | translate }}"
                                  mdp-auto-switch="true"></mdp-time-picker>
             </section>
diff --git a/ui/src/app/entity-view/entity-view.directive.js b/ui/src/app/entity-view/entity-view.directive.js
index 42b3a120fe..e1ae82fa6a 100644
--- a/ui/src/app/entity-view/entity-view.directive.js
+++ b/ui/src/app/entity-view/entity-view.directive.js
@@ -54,8 +54,8 @@ export default function EntityViewDirective($compile, $templateCache, $filter, t
                 if (scope.entityView.startTimeMs > 0) {
                     scope.startTimeMs = new Date(scope.entityView.startTimeMs);
                 }
-                if (scope.entityView.endTimeTs > 0) {
-                    scope.endTimeTs = new Date(scope.entityView.endTimeTs);
+                if (scope.entityView.endTimeMs > 0) {
+                    scope.endTimeMs = new Date(scope.entityView.endTimeMs);
                 }
                 if (!scope.entityView.keys) {
                     scope.entityView.keys = {};
@@ -78,22 +78,22 @@ export default function EntityViewDirective($compile, $templateCache, $filter, t
             }
         });
 
-        scope.$watch('endTimeTs', function (newDate) {
+        scope.$watch('endTimeMs', function (newDate) {
             if (newDate) {
-                if (newDate.getTime() < scope.minEndTimeTs) {
-                    scope.endTimeTs = angular.copy(scope.minEndTimeTs);
+                if (newDate.getTime() < scope.minEndTimeMs) {
+                    scope.endTimeMs = angular.copy(scope.minEndTimeMs);
                 }
                 updateMinMaxDates();
             }
         });
 
         function updateMinMaxDates() {
-            if (scope.endTimeTs) {
-                scope.maxStartTimeMs = angular.copy(new Date(scope.endTimeTs.getTime()));
-                scope.entityView.endTimeTs = scope.endTimeTs.getTime();
+            if (scope.endTimeMs) {
+                scope.maxStartTimeMs = angular.copy(new Date(scope.endTimeMs.getTime()));
+                scope.entityView.endTimeMs = scope.endTimeMs.getTime();
             }
             if (scope.startTimeMs) {
-                scope.minEndTimeTs = angular.copy(new Date(scope.startTimeMs.getTime()));
+                scope.minEndTimeMs = angular.copy(new Date(scope.startTimeMs.getTime()));
                 scope.entityView.startTimeMs = scope.startTimeMs.getTime();
             }
         }