2 files changed, 20 insertions, 4 deletions
diff --git a/web/app/view/edit/Attributes.js b/web/app/view/edit/Attributes.js
index 7788d8c..b080e56 100644
--- a/web/app/view/edit/Attributes.js
+++ b/web/app/view/edit/Attributes.js
@@ -57,9 +57,9 @@ Ext.define('Traccar.view.edit.Attributes', {
                 if (this.attributesStore) {
                     attribute = Ext.getStore(this.attributesStore).getById(record.get('name'));
                 }
-                if (attribute && attribute.get('convert') === 'speed') {
+                if (attribute && attribute.get('dataType') === 'speed') {
                     return Ext.getStore('SpeedUnits').formatValue(value, Traccar.app.getPreference('speedUnit', 'kn'));
-                } else if (attribute && attribute.get('convert') === 'distance') {
+                } else if (attribute && attribute.get('dataType') === 'distance') {
                     return Ext.getStore('DistanceUnits').formatValue(value, Traccar.app.getPreference('distanceUnit', 'km'));
                 } else {
                     return value;
diff --git a/web/app/view/edit/ComputedAttributes.js b/web/app/view/edit/ComputedAttributes.js
index 87d3b8d..741a104 100644
--- a/web/app/view/edit/ComputedAttributes.js
+++ b/web/app/view/edit/ComputedAttributes.js
@@ -46,13 +46,29 @@ Ext.define('Traccar.view.edit.ComputedAttributes', {
             dataIndex: 'description'
         }, {
             text: Strings.sharedAttribute,
-            dataIndex: 'attribute'
+            dataIndex: 'attribute',
+            renderer: function (value) {
+                var attribute = Ext.getStore('PositionAttributes').getById(value);
+                if (attribute) {
+                    return attribute.get('name');
+                } else {
+                    return value;
+                }
+            }
         }, {
             text: Strings.sharedExpression,
             dataIndex: 'expression'
         }, {
             text: Strings.sharedType,
-            dataIndex: 'type'
+            dataIndex: 'type',
+            renderer: function (value) {
+                var type = Ext.getStore('AttributeValueTypes').getById(value);
+                if (type) {
+                    return type.get('name');
+                } else {
+                    return value;
+                }
+            }
         }]
     }
 });