diff --git a/static/js/entitiesDialog.js b/static/js/entitiesDialog.js
index c083931f4..e23da8d8b 100644
--- a/static/js/entitiesDialog.js
+++ b/static/js/entitiesDialog.js
@@ -341,7 +341,7 @@ pandora.ui.entitiesDialog = function(options) {
                     $input = Ox.Input({height: 248, type: 'textarea'});
                 }
                 $input.options({
-                        value: data.key
+                        value: data.key,
                         width: 248
                     })
                     .bindEvent({
@@ -361,4 +361,4 @@ pandora.ui.entitiesDialog = function(options) {
 
     return that;
 
-};
\ No newline at end of file
+};
diff --git a/static/js/entity.js b/static/js/entity.js
index 3813e0faa..1624ba5d8 100644
--- a/static/js/entity.js
+++ b/static/js/entity.js
@@ -6,13 +6,13 @@ pandora.ui.entity = function(options, callback) {
     // options: {id, view}
     pandora.api.getEntity({
         id: options.id
-    }, function(data) {
+    }, function(response) {
         Ox.get(
-            '/static/html/entities.' + data.type + '.' + options.view + '.html',
+            '/static/html/entities.' + response.data.type + '.' + options.view + '.html',
             function(html) {
                 html = html.replace(/\{(.+?)\}/g, function() {
                     var parts = arguments[1].split('|'),
-                        value = data[parts[0]];
+                        value = response.data[parts[0]];
                     return Ox.isEmpty(value)
                         || Ox.isNull(value)
                         || Ox.isUndefined(value)
@@ -24,4 +24,4 @@ pandora.ui.entity = function(options, callback) {
             }
         );
     });
-};
\ No newline at end of file
+};