2 files changed, 15 insertions, 1 deletions

diff --git a/modern/src/common/attributes/usePositionAttributes.js b/modern/src/common/attributes/usePositionAttributes.js
index 4b779090..b9eb354c 100644
--- a/modern/src/common/attributes/usePositionAttributes.js
+++ b/modern/src/common/attributes/usePositionAttributes.js
@@ -4,56 +4,69 @@ export default (t) => useMemo(() => ({
   id: {
     name: t('deviceIdentifier'),
     type: 'number',
+    property: true,
   },
   latitude: {
     name: t('positionLatitude'),
     type: 'number',
+    property: true,
   },
   longitude: {
     name: t('positionLongitude'),
     type: 'number',
+    property: true,
   },
   speed: {
     name: t('positionSpeed'),
     type: 'number',
     dataType: 'speed',
+    property: true,
   },
   course: {
     name: t('positionCourse'),
     type: 'number',
+    property: true,
   },
   altitude: {
     name: t('positionAltitude'),
     type: 'number',
+    property: true,
   },
   accuracy: {
     name: t('positionAccuracy'),
     type: 'number',
     dataType: 'distance',
+    property: true,
   },
   valid: {
     name: t('positionValid'),
     type: 'boolean',
+    property: true,
   },
   protocol: {
     name: t('positionProtocol'),
     type: 'string',
+    property: true,
   },
   address: {
     name: t('positionAddress'),
     type: 'string',
+    property: true,
   },
   deviceTime: {
     name: t('positionDeviceTime'),
     type: 'string',
+    property: true,
   },
   fixTime: {
     name: t('positionFixTime'),
     type: 'string',
+    property: true,
   },
   serverTime: {
     name: t('positionServerTime'),
     type: 'string',
+    property: true,
   },
   raw: {
     name: t('positionRaw'),
diff --git a/modern/src/settings/ComputedAttributePage.js b/modern/src/settings/ComputedAttributePage.js
index 95681f2a..c9170650 100644
--- a/modern/src/settings/ComputedAttributePage.js
+++ b/modern/src/settings/ComputedAttributePage.js
@@ -36,7 +36,7 @@ const ComputedAttributePage = () => {
 
   const [item, setItem] = useState();
 
-  const options = Object.entries(positionAttributes).map(([key, value]) => ({
+  const options = Object.entries(positionAttributes).filter(([, value]) => !value.property).map(([key, value]) => ({
     key,
     name: value.name,
     type: value.type,
@@ -71,6 +71,7 @@ const ComputedAttributePage = () => {
               label={t('sharedDescription')}
             />
             <Autocomplete
+              value={options.find((option) => option.key === item.attribute) || item.attribute}
               onChange={(_, option) => {
                 const attribute = option ? option.key || option : null;
                 if (option && option.type) {