diff --git a/src/AdminUI/src/components/LoginPage.vue b/src/AdminUI/src/components/LoginPage.vue
index b57c3ccf..4d04b88c 100644
--- a/src/AdminUI/src/components/LoginPage.vue
+++ b/src/AdminUI/src/components/LoginPage.vue
@@ -11,6 +11,7 @@
               <v-text-field v-model="username" :label="$t('login.username')" name="username" prepend-icon="mdi-account"
                 type="text" required ref="usernameField" autofocus></v-text-field>
               <v-text-field v-model="password" :label="$t('login.password')" name="password" prepend-icon="mdi-lock"
+              v-on:keyup.enter="login"
                 type="password" required></v-text-field>
               <v-alert v-if="errorMessage" type="error" dense>
                 {{ errorMessage }}
diff --git a/src/AdminUI/src/components/ProtocolDriverInstancesTab.vue b/src/AdminUI/src/components/ProtocolDriverInstancesTab.vue
index ba2a6d25..f968a676 100644
--- a/src/AdminUI/src/components/ProtocolDriverInstancesTab.vue
+++ b/src/AdminUI/src/components/ProtocolDriverInstancesTab.vue
@@ -1,18 +1,32 @@
 <template>
   <v-container fluid class="protocol-driver-instances-tab">
-
-    <v-btn color="primary" size="small" class="mt-0 me-2" @click="openAddProtocolDriverInstanceDialog">{{
-      $t('admin.protocolDriverInstances.addProtocolDriverInstance') }}
+    <v-btn
+      color="primary"
+      size="small"
+      class="mt-0 me-2"
+      @click="openAddProtocolDriverInstanceDialog"
+      >{{ $t('admin.protocolDriverInstances.addProtocolDriverInstance') }}
       <v-icon>mdi-plus</v-icon>
     </v-btn>
 
-    <v-btn color="secondary" size="small" class="mt-0" @click="fetchProtocolDriverInstances">
+    <v-btn
+      color="secondary"
+      size="small"
+      class="mt-0"
+      @click="fetchProtocolDriverInstances"
+    >
       {{ $t('common.refresh') }}
       <v-icon>mdi-refresh</v-icon>
     </v-btn>
 
-    <v-data-table :headers="headers" :items="driverInstances" :items-per-page="5" class="mt-4 elevation-1"
-      :load-children="fetchProtocolDriverInstances" :items-per-page-text="$t('common.itemsPerPageText')">
+    <v-data-table
+      :headers="headers"
+      :items="driverInstances"
+      :items-per-page="5"
+      class="mt-4 elevation-1"
+      :load-children="fetchProtocolDriverInstances"
+      :items-per-page-text="$t('common.itemsPerPageText')"
+    >
       <template #[`item.enabled`]="{ item }">
         <v-icon v-if="item.enabled" color="green">mdi-check</v-icon>
         <v-icon v-else color="red">mdi-close</v-icon>
@@ -21,10 +35,17 @@
         <span class="text-caption">{{ item.stats }}</span>
       </template>
       <template #[`item.actions`]="{ item }">
-        <v-icon size="small" class="me-2" @click="openEditProtocolDriverInstanceDialog(item)">
+        <v-icon
+          size="small"
+          class="me-2"
+          @click="openEditProtocolDriverInstanceDialog(item)"
+        >
           mdi-pencil
         </v-icon>
-        <v-icon size="small" @click="openDeleteProtocolDriverInstanceDialog(item)">
+        <v-icon
+          size="small"
+          @click="openDeleteProtocolDriverInstanceDialog(item)"
+        >
           mdi-delete
         </v-icon>
       </template>
@@ -33,48 +54,104 @@
         <v-icon v-else color="red">mdi-close</v-icon>
       </template>
       <template #[`item.process`]="{ item }">
-        <v-icon v-if="!item.running" disabled size="small" class="me-2" @click="startProtocolDriverInstance(item)">
+        <v-icon
+          v-if="!item.running"
+          disabled
+          size="small"
+          class="me-2"
+          @click="startProtocolDriverInstance(item)"
+        >
           mdi-play
         </v-icon>
-        <v-icon v-if="item.running" disabled size="small" class="me-2" @click="stopProtocolDriverInstance(item)">
+        <v-icon
+          v-if="item.running"
+          disabled
+          size="small"
+          class="me-2"
+          @click="stopProtocolDriverInstance(item)"
+        >
           mdi-stop
         </v-icon>
       </template>
     </v-data-table>
     <div>
-      <v-chip v-if="error" color="red darken-1">{{ $t('common.error') }}</v-chip>
+      <v-chip v-if="error" color="red darken-1">{{
+        $t('common.error')
+      }}</v-chip>
     </div>
-
   </v-container>
 
   <v-dialog v-model="dialogEditInstance" scrollable max-width="500px">
     <v-card>
       <v-card-title>
-        <span class="text-h5">{{ $t('admin.protocolDriverInstances.editInstance') }}</span>
+        <span class="text-h5">{{
+          $t('admin.protocolDriverInstances.editInstance')
+        }}</span>
       </v-card-title>
       <v-card-text>
         <v-container>
-          <v-select required v-model="editedInstance.protocolDriver" :items="driverNameItems" item-title="name"
-            variant="outlined" :label="$t('admin.protocolDriverInstances.headers.protocolDriver')"
-            @update:model-value="onDriverNameChange"></v-select>
-          <v-text-field v-model="editedInstance.protocolDriverInstanceNumber" variant="outlined"
-            :label="$t('admin.protocolDriverInstances.headers.protocolDriverInstanceNumber')" type="number"
-            disabled></v-text-field>
-          <v-switch v-model="editedInstance.enabled" inset color="primary" :label="`${$t('common.enabled')}${editedInstance.enabled
-            ? $t('common.true')
-            : $t('common.false')
-            }`" class="mb-0"></v-switch>
-          <v-select v-model="editedInstance.logLevel" :items="[
-            { text: $t('common.logLevels.minimum'), value: 0 },
-            { text: $t('common.logLevels.basic'), value: 1 },
-            { text: $t('common.logLevels.detailed'), value: 2 },
-            { text: $t('common.logLevels.maximum'), value: 3 }
-          ]" item-title="text" item-value="value" :label="$t('admin.protocolDriverInstances.headers.logLevel')"
-            variant="outlined"></v-select>
-          <v-select v-model="editedInstance.nodeNames" :items="nodeNames" item-title="name" variant="outlined" chips
-            closable-chips small-chips :label="$t('admin.protocolDriverInstances.headers.allowedNodesList')"
-            multiple></v-select>
-          <v-btn class="mt-4 me-2" color="blue" text variant="tonal" @click="dialogAddNode = true">
+          <v-select
+            required
+            v-model="editedInstance.protocolDriver"
+            :items="driverNameItems"
+            item-title="name"
+            variant="outlined"
+            :label="$t('admin.protocolDriverInstances.headers.protocolDriver')"
+            @update:model-value="onDriverNameChange"
+          ></v-select>
+          <v-text-field
+            v-model="editedInstance.protocolDriverInstanceNumber"
+            variant="outlined"
+            :label="
+              $t(
+                'admin.protocolDriverInstances.headers.protocolDriverInstanceNumber'
+              )
+            "
+            type="number"
+            disabled
+          ></v-text-field>
+          <v-switch
+            v-model="editedInstance.enabled"
+            inset
+            color="primary"
+            :label="`${$t('common.enabled')}${
+              editedInstance.enabled ? $t('common.true') : $t('common.false')
+            }`"
+            class="mb-0"
+          ></v-switch>
+          <v-select
+            v-model="editedInstance.logLevel"
+            :items="[
+              { text: $t('common.logLevels.minimum'), value: 0 },
+              { text: $t('common.logLevels.basic'), value: 1 },
+              { text: $t('common.logLevels.detailed'), value: 2 },
+              { text: $t('common.logLevels.maximum'), value: 3 },
+            ]"
+            item-title="text"
+            item-value="value"
+            :label="$t('admin.protocolDriverInstances.headers.logLevel')"
+            variant="outlined"
+          ></v-select>
+          <v-select
+            v-model="editedInstance.nodeNames"
+            :items="nodeNames"
+            item-title="name"
+            variant="outlined"
+            chips
+            closable-chips
+            small-chips
+            :label="
+              $t('admin.protocolDriverInstances.headers.allowedNodesList')
+            "
+            multiple
+          ></v-select>
+          <v-btn
+            class="mt-4 me-2"
+            color="blue"
+            text
+            variant="tonal"
+            @click="dialogAddNode = true"
+          >
             {{ $t('admin.protocolDriverInstances.addNewNode') }}
             <v-icon>mdi-plus</v-icon>
           </v-btn>
@@ -82,12 +159,24 @@
       </v-card-text>
 
       <v-card-actions>
-        <v-chip v-if="error" color="red darken-1">{{ $t('common.error') }}</v-chip>
+        <v-chip v-if="error" color="red darken-1">{{
+          $t('common.error')
+        }}</v-chip>
         <v-spacer></v-spacer>
-        <v-btn color="orange darken-1" text variant="tonal" @click="dialogEditInstance = false">
+        <v-btn
+          color="orange darken-1"
+          text
+          variant="tonal"
+          @click="dialogEditInstance = false"
+        >
           {{ $t('common.cancel') }}
         </v-btn>
-        <v-btn color="blue darken-1" text variant="tonal" @click="updateOrCreateProtocolDriverInstance">
+        <v-btn
+          color="blue darken-1"
+          text
+          variant="tonal"
+          @click="updateOrCreateProtocolDriverInstance"
+        >
           {{ $t('common.save') }}
         </v-btn>
       </v-card-actions>
@@ -97,22 +186,36 @@
   <v-dialog v-model="dialogAddNode" max-width="400" class="pa-8">
     <v-card>
       <v-card-title class="headline">
-        {{ $t("admin.protocolDriverInstances.addNewNode") }}
+        {{ $t('admin.protocolDriverInstances.addNewNode') }}
       </v-card-title>
 
       <v-card-title class="headline">
-        <v-text-field autofocus :label="$t('admin.protocolDriverInstances.newNodeName')" v-model="newNode"></v-text-field>
+        <v-text-field
+          autofocus
+          :label="$t('admin.protocolDriverInstances.newNodeName')"
+          v-model="newNode"
+        ></v-text-field>
       </v-card-title>
 
       <v-card-actions>
         <v-spacer></v-spacer>
 
-        <v-btn color="orange darken-1" text variant="tonal" @click="dialogAddNode = false">
-          {{ $t("common.cancel") }}
+        <v-btn
+          color="orange darken-1"
+          text
+          variant="tonal"
+          @click="dialogAddNode = false"
+        >
+          {{ $t('common.cancel') }}
         </v-btn>
 
-        <v-btn color="blue darken-1" text variant="tonal" @click="dialogAddNode = false; addNewNode(newNode);">
-          {{ $t("common.save") }}
+        <v-btn
+          color="blue darken-1"
+          text
+          variant="tonal"
+          @click="addNewNode(newNode)"
+        >
+          {{ $t('common.save') }}
         </v-btn>
       </v-card-actions>
     </v-card>
@@ -120,47 +223,97 @@
 
   <v-dialog v-model="dialogDeleteInstance" max-width="400px">
     <v-card>
-      <v-card-title>{{ $t('admin.protocolDriverInstances.deleteInstance') }}</v-card-title>
+      <v-card-title>{{
+        $t('admin.protocolDriverInstances.deleteInstance')
+      }}</v-card-title>
       <v-card-text>
         {{ $t('admin.protocolDriverInstances.deleteInstanceConfirm') }}
       </v-card-text>
       <v-card-text>
-        {{ editedInstance.protocolDriver + " / " + editedInstance.protocolDriverInstanceNumber }}
+        {{
+          editedInstance.protocolDriver +
+          ' / ' +
+          editedInstance.protocolDriverInstanceNumber
+        }}
       </v-card-text>
       <v-card-actions>
         <v-spacer></v-spacer>
-        <v-btn color="orange darken-1" text variant="tonal" @click="dialogDeleteInstance = false">
+        <v-btn
+          color="orange darken-1"
+          text
+          variant="tonal"
+          @click="dialogDeleteInstance = false"
+        >
           {{ $t('common.cancel') }}
         </v-btn>
-        <v-btn color="red darken-1" text variant="tonal" @click="deleteDriverInstance(editedInstance)">
+        <v-btn
+          color="red darken-1"
+          text
+          variant="tonal"
+          @click="deleteDriverInstance(editedInstance)"
+        >
           {{ $t('common.delete') }}
         </v-btn>
       </v-card-actions>
-      <v-chip v-if="error" color="red darken-1">{{ $t('common.error') }}</v-chip>
+      <v-chip v-if="error" color="red darken-1">{{
+        $t('common.error')
+      }}</v-chip>
     </v-card>
   </v-dialog>
-
 </template>
 <script setup>
-import { ref, computed, onMounted, onUnmounted } from 'vue';
-import { useI18n } from 'vue-i18n';
+import { ref, computed, onMounted, onUnmounted } from 'vue'
+import { useI18n } from 'vue-i18n'
 
-const { t } = useI18n();
+const { t } = useI18n()
 const headers = computed(() => [
   { title: '#', key: 'id', align: 'end' },
-  { title: t('admin.protocolDriverInstances.headers.protocolDriver'), align: 'start', key: 'protocolDriver' },
-  { title: t('admin.protocolDriverInstances.headers.protocolDriverInstanceNumber'), align: 'end', key: 'protocolDriverInstanceNumber' },
+  {
+    title: t('admin.protocolDriverInstances.headers.protocolDriver'),
+    align: 'start',
+    key: 'protocolDriver',
+  },
+  {
+    title: t(
+      'admin.protocolDriverInstances.headers.protocolDriverInstanceNumber'
+    ),
+    align: 'end',
+    key: 'protocolDriverInstanceNumber',
+  },
   { title: t('admin.protocolDriverInstances.headers.enabled'), key: 'enabled' },
-  { title: t('admin.protocolDriverInstances.headers.logLevel'), key: 'logLevel' },
-  { title: t('admin.protocolDriverInstances.headers.allowedNodesList'), key: 'nodesText' },
-  { title: t('admin.protocolDriverInstances.headers.actions'), key: 'actions', sortable: false },
+  {
+    title: t('admin.protocolDriverInstances.headers.logLevel'),
+    key: 'logLevel',
+  },
+  {
+    title: t('admin.protocolDriverInstances.headers.allowedNodesList'),
+    key: 'nodesText',
+  },
+  {
+    title: t('admin.protocolDriverInstances.headers.actions'),
+    key: 'actions',
+    sortable: false,
+  },
   { title: t('admin.protocolDriverInstances.headers.running'), key: 'running' },
-  { title: t('admin.protocolDriverInstances.headers.activeNodeKeepAliveTimeTag'), key: 'localTimeUpdate' },
-  { title: t('admin.protocolDriverInstances.headers.stats'), key: 'stats', sortable: false },
-  { title: t('admin.protocolDriverInstances.headers.process'), key: 'process', sortable: false },
-]);
-
-const dialogEditInstance = ref(false);
+  {
+    title: t(
+      'admin.protocolDriverInstances.headers.activeNodeKeepAliveTimeTag'
+    ),
+    key: 'localTimeUpdate',
+  },
+  {
+    title: t('admin.protocolDriverInstances.headers.stats'),
+    key: 'stats',
+    sortable: false,
+  },
+  {
+    title: t('admin.protocolDriverInstances.headers.process'),
+    key: 'process',
+    sortable: false,
+  },
+])
+
+const dialogEditInstance = ref(false)
 const editedInstanceDefault = ref({
   protocolDriver: '',
   protocolDriverInstanceNumber: '',
@@ -177,245 +330,300 @@ const editedInstanceDefault = ref({
   running: false,
   localTimeUpdate: '',
   process: '',
-});
-const editedInstance = ref({ ...editedInstanceDefault.value });
+})
+const editedInstance = ref({ ...editedInstanceDefault.value })
 
-const dialogDeleteInstance = ref(false);
-const dialogAddNode = ref(false);
-const newNode = ref("");
-const nodeNames = ref([]);
+const dialogDeleteInstance = ref(false)
+const dialogAddNode = ref(false)
+const newNode = ref('')
+const nodeNames = ref([])
 const driverNameItems = [
-  "IEC60870-5-104",
-  "IEC60870-5-104_SERVER",
-  "IEC60870-5-101",
-  "IEC60870-5-101_SERVER",
-  "IEC61850",
-  "IEC61850_SERVER",
-  "DNP3",
-  "DNP3_SERVER",
-  "MQTT-SPARKPLUG-B",
-  "OPC-UA",
-  "OPC-UA_SERVER",
-  "OPC-DA",
-  "OPC-DA_SERVER",
-  "PLCTAG",
-  "PLC4X",
-  "TELEGRAF-LISTENER",
-  "ICCP",
-  "ICCP_SERVER",
-  "I104M",
-  "PI_DATA_ARCHIVE_INJECTOR",
-  "PI_DATA_ARCHIVE_CLIENT",
-];
-const driverInstances = ref([]);
-const error = ref(false);
+  'IEC60870-5-104',
+  'IEC60870-5-104_SERVER',
+  'IEC60870-5-101',
+  'IEC60870-5-101_SERVER',
+  'IEC61850',
+  'IEC61850_SERVER',
+  'DNP3',
+  'DNP3_SERVER',
+  'MQTT-SPARKPLUG-B',
+  'OPC-UA',
+  'OPC-UA_SERVER',
+  'OPC-DA',
+  'OPC-DA_SERVER',
+  'PLCTAG',
+  'PLC4X',
+  'TELEGRAF-LISTENER',
+  'ICCP',
+  'ICCP_SERVER',
+  'I104M',
+  'PI_DATA_ARCHIVE_INJECTOR',
+  'PI_DATA_ARCHIVE_CLIENT',
+]
+const driverInstances = ref([])
+const error = ref(false)
 
 onMounted(() => {
-  fetchProtocolDriverInstances();
-  document.documentElement.style.overflowY = 'scroll';
-});
+  fetchProtocolDriverInstances()
+  document.documentElement.style.overflowY = 'scroll'
+})
 
 onUnmounted(() => {
-  document.documentElement.style.overflowY = 'auto';
-});
+  document.documentElement.style.overflowY = 'auto'
+})
 
 async function fetchNodes() {
   try {
-    const res = await fetch("/Invoke/auth/listNodes");
-    const json = await res.json();
-    if (json.error) { console.warn(json); return; }
-    nodeNames.value = json;
+    const res = await fetch('/Invoke/auth/listNodes')
+    const json = await res.json()
+    if (json.error) {
+      console.warn(json)
+      return
+    }
+    nodeNames.value = json
   } catch (err) {
-    console.warn(err);
+    console.warn(err)
+    // error.value = true;
   }
 }
 
 async function fetchProtocolDriverInstances() {
-  await fetchNodes();
+  await fetchNodes()
   try {
-    const res = await fetch("/Invoke/auth/listProtocolDriverInstances");
-    const json = await res.json();
-    if (json.error) { console.wanr(json); return; }
+    const res = await fetch('/Invoke/auth/listProtocolDriverInstances')
+    const json = await res.json()
+    if (json.error) {
+      console.wanr(json)
+      return
+    }
     json.forEach((item, index) => {
-      item.id = index + 1;
-      item.nodesText = item.nodeNames.join(', ');
-      item.localTimeUpdate = item.activeNodeName + " " + (item.activeNodeKeepAliveTimeTag ? new Date(item.activeNodeKeepAliveTimeTag).toLocaleString() : '');
-      item.running = new Date(item.activeNodeKeepAliveTimeTag).getTime() > new Date().getTime() - 10000;
-    });
-    driverInstances.value = json;
+      item.id = index + 1
+      item.nodesText = item.nodeNames.join(', ')
+      item.localTimeUpdate =
+        item.activeNodeName +
+        ' ' +
+        (item.activeNodeKeepAliveTimeTag
+          ? new Date(item.activeNodeKeepAliveTimeTag).toLocaleString()
+          : '')
+      item.running =
+        new Date(item.activeNodeKeepAliveTimeTag).getTime() >
+        new Date().getTime() - 10000
+    })
+    driverInstances.value = json
   } catch (err) {
-    console.warn(err);
+    console.warn(err)
+    // error.value = true;
   }
 }
 
 async function startProtocolDriverInstance(item) {
   try {
-    const res = await fetch("/Invoke/auth/startProtocolDriverInstance", {
-      method: "post",
+    const res = await fetch('/Invoke/auth/startProtocolDriverInstance', {
+      method: 'post',
       headers: {
-        Accept: "application/json",
-        "Content-Type": "application/json",
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
       },
       body: JSON.stringify({
         protocolDriver: item.protocolDriver,
         protocolDriverInstanceNumber: item.protocolDriverInstanceNumber,
       }),
-    });
-    const json = await res.json();
-    if (json.error) console.warn(json);
+    })
+    const json = await res.json()
+    if (json.error) {
+      console.warn(json)
+      error.value = true
+    }
   } catch (err) {
-    console.warn(err);
+    console.warn(err)
+    error.value = true
   }
   setTimeout(() => {
-    fetchProtocolDriverInstances(); // Refresh instances
-  }, 3000);
+    fetchProtocolDriverInstances() // Refresh instances
+  }, 3000)
 }
 
 async function stopProtocolDriverInstance(item) {
   try {
-    const res = await fetch("/Invoke/auth/stopProtocolDriverInstance", {
-      method: "post",
+    const res = await fetch('/Invoke/auth/stopProtocolDriverInstance', {
+      method: 'post',
       headers: {
-        Accept: "application/json",
-        "Content-Type": "application/json",
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
       },
       body: JSON.stringify({
         protocolDriver: item.protocolDriver,
         protocolDriverInstanceNumber: item.protocolDriverInstanceNumber,
       }),
-    });
-    const json = await res.json();
-    if (json.error) console.warn(json);
+    })
+    const json = await res.json()
+    if (json.error) {
+      console.warn(json)
+      error.value = true
+    }
   } catch (err) {
-    console.warn(err);
+    console.warn(err)
+    error.value = true
   }
   setTimeout(() => {
-    fetchProtocolDriverInstances(); // Refresh instances
-  }, 3000);
+    fetchProtocolDriverInstances() // Refresh instances
+  }, 3000)
 }
 
-// make sure the protocol driver instance number is unique for the protocol driver  
+// make sure the protocol driver instance number is unique for the protocol driver
 async function onDriverNameChange(name) {
-  let instanceNumber = 1;
+  let instanceNumber = 1
   for (const instance of driverInstances.value) {
     if (instance.protocolDriver === name) {
-      instanceNumber = instance.protocolDriverInstanceNumber + 1;
-      break;
+      instanceNumber = instance.protocolDriverInstanceNumber + 1
+      break
     }
   }
-  editedInstance.value.protocolDriverInstanceNumber = instanceNumber;
+  editedInstance.value.protocolDriverInstanceNumber = instanceNumber
 }
 
 async function deleteDriverInstance(item) {
   try {
-    const res = await fetch("/Invoke/auth/deleteProtocolDriverInstance", {
-      method: "post",
+    const res = await fetch('/Invoke/auth/deleteProtocolDriverInstance', {
+      method: 'post',
       headers: {
-        Accept: "application/json",
-        "Content-Type": "application/json",
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
       },
       body: JSON.stringify({
         protocolDriver: item.protocolDriver,
         protocolDriverInstanceNumber: item.protocolDriverInstanceNumber,
         _id: item._id,
       }),
-    });
-    const json = await res.json();
+    })
+    const json = await res.json()
     if (json.error) {
-      console.warn(json);
-      return;
+      console.warn(json)
+      return
     }
-    dialogDeleteInstance.value = false;
+    dialogDeleteInstance.value = false
   } catch (err) {
-    console.warn(err);
+    console.warn(err)
+    error.value = true
   }
-  fetchProtocolDriverInstances(); // refreshes instances
+  fetchProtocolDriverInstances() // refreshes instances
 }
 
 async function createDriverInstance() {
   try {
-    const dup = Object.assign({}, editedInstance.value);
-    if (dup._id) { delete dup._id; }
-    const res = await fetch("/Invoke/auth/createProtocolDriverInstance", {
-      method: "post",
+    const dup = Object.assign({}, editedInstance.value)
+    if (dup._id) {
+      delete dup._id
+    }
+    const res = await fetch('/Invoke/auth/createProtocolDriverInstance', {
+      method: 'post',
       headers: {
-        Accept: "application/json",
-        "Content-Type": "application/json",
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
       },
       body: JSON.stringify({}),
-    });
-    const json = await res.json();
-    if (json.error || !json._id) { console.warn(json); error.value = true; return; }
-    editedInstance.value._id = json._id;
-    await updateProtocolDriverInstance();
-    dialogEditInstance.value = false;
+    })
+    const json = await res.json()
+    if (json.error || !json._id) {
+      console.warn(json)
+      error.value = true
+      return
+    }
+    editedInstance.value._id = json._id
+    await updateProtocolDriverInstance()
+    dialogEditInstance.value = false
   } catch (err) {
-    console.warn(err);
+    console.warn(err)
+    error.value = true
   }
-  fetchProtocolDriverInstances(); // Refresh instances
+  fetchProtocolDriverInstances() // Refresh instances
 }
 
 async function updateProtocolDriverInstance() {
-  if (editedInstance.value.protocolDriver === "") return;
-  const dup = Object.assign({}, editedInstance.value);
-  if ('id' in dup) { delete dup.id; }
-  if ('nodesText' in dup) { delete dup.nodesText; }
-  if ('running' in dup) { delete dup.running; }
-  if ('localTimeUpdate' in dup) { delete dup.localTimeUpdate; }
-  if ('process' in dup) { delete dup.process; }
-  if ('stats' in dup) { delete dup.stats; }
-  if ('activeNodeName' in dup) { delete dup.activeNodeName; }
-  if ('activeNodeKeepAliveTimeTag' in dup) { delete dup.activeNodeKeepAliveTimeTag; }
-  if ('softwareVersion' in dup) { delete dup.softwareVersion; }
+  if (editedInstance.value.protocolDriver === '') return
+  const dup = Object.assign({}, editedInstance.value)
+  if ('id' in dup) {
+    delete dup.id
+  }
+  if ('nodesText' in dup) {
+    delete dup.nodesText
+  }
+  if ('running' in dup) {
+    delete dup.running
+  }
+  if ('localTimeUpdate' in dup) {
+    delete dup.localTimeUpdate
+  }
+  if ('process' in dup) {
+    delete dup.process
+  }
+  if ('stats' in dup) {
+    delete dup.stats
+  }
+  if ('activeNodeName' in dup) {
+    delete dup.activeNodeName
+  }
+  if ('activeNodeKeepAliveTimeTag' in dup) {
+    delete dup.activeNodeKeepAliveTimeTag
+  }
+  if ('softwareVersion' in dup) {
+    delete dup.softwareVersion
+  }
   try {
-    const res = await fetch("/Invoke/auth/updateProtocolDriverInstance", {
-      method: "post",
+    const res = await fetch('/Invoke/auth/updateProtocolDriverInstance', {
+      method: 'post',
       headers: {
-        Accept: "application/json",
-        "Content-Type": "application/json",
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
       },
       body: JSON.stringify(dup),
-    });
-    const json = await res.json();
-    if (json.error) { console.log(json); error.value = true; return; }
-    dialogEditInstance.value = false;
+    })
+    const json = await res.json()
+    if (json.error) {
+      console.log(json)
+      error.value = true
+      return
+    }
+    dialogEditInstance.value = false
   } catch (err) {
-    console.warn(err);
+    console.warn(err)
+    error.value = true
   }
-  fetchProtocolDriverInstances(); // Refresh instances
+  fetchProtocolDriverInstances() // Refresh instances
 }
 
 async function updateOrCreateProtocolDriverInstance() {
   if (editedInstance.value._id) {
-    await updateProtocolDriverInstance();
+    await updateProtocolDriverInstance()
   } else {
-    await createDriverInstance();
+    await createDriverInstance()
   }
 }
 
 async function addNewNode() {
-  if (!newNode.value || newNode.value === "") return;
-  nodeNames.value.push(newNode.value);
-  editedInstance.value.nodeNames.push(newNode.value);
-  editedInstance.value.nodeNames = [...new Set(editedInstance.value.nodeNames)];
-  newNode.value = "";
+  dialogAddNode = false
+  if (!newNode.value || newNode.value === '') return
+  nodeNames.value.push(newNode.value)
+  editedInstance.value.nodeNames.push(newNode.value)
+  editedInstance.value.nodeNames = [...new Set(editedInstance.value.nodeNames)]
+  newNode.value = ''
 }
 
 const openAddProtocolDriverInstanceDialog = () => {
-  editedInstance.value = Object.assign({}, editedInstanceDefault.value);
-  dialogEditInstance.value = true;
-};
+  error.value = false
+  editedInstance.value = Object.assign({}, editedInstanceDefault.value)
+  dialogEditInstance.value = true
+}
 
 const openEditProtocolDriverInstanceDialog = (item) => {
-  editedInstance.value = Object.assign({}, item);
-  dialogEditInstance.value = true;
-};
+  editedInstance.value = Object.assign({}, item)
+  dialogEditInstance.value = true
+}
 
 const openDeleteProtocolDriverInstanceDialog = (item) => {
-  editedInstance.value = Object.assign({}, item);
-  dialogDeleteInstance.value = true;
-};
+  editedInstance.value = Object.assign({}, item)
+  dialogDeleteInstance.value = true
+}
 
 defineExpose({ fetchProtocolDriverInstances })
-
 </script>
diff --git a/src/AdminUI/src/components/TagsTab.vue b/src/AdminUI/src/components/TagsTab.vue
index 5dadd2ac..e1c2e2ee 100644
--- a/src/AdminUI/src/components/TagsTab.vue
+++ b/src/AdminUI/src/components/TagsTab.vue
@@ -1,68 +1,67 @@
 <template>
-    <div>
-        <v-data-table-server :headers="headers" :items="tags" :items-per-page="itemsPerPage" :page="page"
-            :items-length="totalTags" :loading="loading" @update:options="handleOptionsUpdate" multi-sort
-            class="elevation-1" density="compact">
-            <template v-slot:top>
-                <v-toolbar flat class="d-print-none">
-                    <v-text-field density="compact" @update:model-value="fetchTags" v-model="searchTag"
-                        append-icon="mdi-magnify" :label="$t('admin.tags.searchTag')" hide-details></v-text-field>
-                    <v-divider class="mx-4" inset vertical></v-divider>
-
-                    <v-text-field density="compact" @update:model-value="fetchTags" v-model="searchDescription"
-                        append-icon="mdi-magnify" :label="$t('admin.tags.searchDescription')"
-                        hide-details></v-text-field>
-                    <v-divider class="mx-4" inset vertical></v-divider>
-
-                    <v-btn color="primary" @click="fetchTags()">
-                        <v-icon>mdi-refresh</v-icon>
-                    </v-btn>
-                    <v-btn color="blue" size="small" variant="flat" @click="newTag()">
-                        <v-icon>mdi-plus</v-icon>
-                        {{ $t('admin.tags.newTag') }}
-                    </v-btn>
-
-                </v-toolbar>
-            </template>
-
-            <template #[`item.value`]="{ item }">
-                {{ item.value.toFixed(3) }}
-            </template>
-
-            <template #[`item.tag`]="{ item }">
-                <span class="text-caption">{{ item.tag }}</span>
-            </template>
-
-            <template #[`item.description`]="{ item }">
-                <span class="text-caption">{{ item.description }}</span>
-            </template>
-
-            <template #[`item.valueJson`]="{ item }">
-                <span class="text-caption">{{ item.valueJson }}</span>
-            </template>
-
-            <template v-slot:[`item.Actions`]="{ item }">
-                <v-icon size="small" class="me-2" @click="editTag(item)">mdi-pencil</v-icon>
-                <v-icon size="small" @click="deleteTagOpenDialog(item)">mdi-delete</v-icon>
-            </template>
-        </v-data-table-server>
-    </div>
-
-    <v-dialog scrollable v-model="dialogDelete" max-width="500px">
+    <v-data-table-server :headers="headers" :items="tags" :items-per-page="itemsPerPage" :page="page"
+        :items-length="totalTags" :loading="loading" @update:options="handleOptionsUpdate" multi-sort
+        class="elevation-1" density="compact">
+        <template v-slot:top>
+            <v-toolbar flat class="d-print-none">
+                <v-text-field density="compact" @update:model-value="fetchTags" v-model="searchTag"
+                    append-icon="mdi-magnify" :label="$t('admin.tags.searchTag')" hide-details></v-text-field>
+                <v-divider class="mx-4" inset vertical></v-divider>
+
+                <v-text-field density="compact" @update:model-value="fetchTags" v-model="searchDescription"
+                    append-icon="mdi-magnify" :label="$t('admin.tags.searchDescription')" hide-details></v-text-field>
+                <v-divider class="mx-4" inset vertical></v-divider>
+
+                <v-btn color="primary" @click="fetchTags()">
+                    <v-icon>mdi-refresh</v-icon>
+                </v-btn>
+                <v-btn color="blue" size="small" variant="flat" @click="newTagOpenDialog">
+                    <v-icon>mdi-plus</v-icon>
+                    {{ $t('admin.tags.newTag') }}
+                </v-btn>
+
+            </v-toolbar>
+        </template>
+
+        <template #[`item.value`]="{ item }">
+            {{ item.value.toFixed(3) }}
+        </template>
+
+        <template #[`item.tag`]="{ item }">
+            <span class="text-caption">{{ item.tag }}</span>
+        </template>
+
+        <template #[`item.description`]="{ item }">
+            <span class="text-caption">{{ item.description }}</span>
+        </template>
+
+        <template #[`item.valueJson`]="{ item }">
+            <span class="text-caption">{{ item.valueJson }}</span>
+        </template>
+
+        <template v-slot:[`item.Actions`]="{ item }">
+            <v-icon size="small" class="me-2" @click="editTagOpenDialog(item)">mdi-pencil</v-icon>
+            <v-icon size="small" @click="deleteTagOpenDialog(item)">mdi-delete</v-icon>
+        </template>
+    </v-data-table-server>
+    <v-chip v-if="error" color="red darken-1">{{ $t('common.error') }}</v-chip>
+
+    <v-dialog scrollable v-model="dialogDeleteTag" max-width="500px">
         <v-card>
             <v-card-title class="headline">{{
                 $t('admin.tags.confirmErase')
-            }}</v-card-title>
+                }}</v-card-title>
             <v-card-text>
-                <v-text-field density="compact" readonly variant="outlined" v-model="editedItem._id"
+                <v-text-field density="compact" readonly variant="outlined" v-model="editedTag._id"
                     :label="$t('admin.tags.eraseId')"></v-text-field>
                 <v-spacer></v-spacer>
-                <v-text-field density="compact" readonly variant="outlined" v-model="editedItem.tag"
+                <v-text-field density="compact" readonly variant="outlined" v-model="editedTag.tag"
                     :label="$t('admin.tags.eraseName')"></v-text-field>
             </v-card-text>
             <v-card-actions>
+                <v-chip v-if="error" color="red darken-1">{{ $t('common.error') }}</v-chip>
                 <v-spacer></v-spacer>
-                <v-btn color="orange darken-1" text variant="tonal" @click="closeDelete">{{
+                <v-btn color="orange darken-1" text variant="tonal" @click="closeDeleteTag">{{
                     $t('common.cancel') }}</v-btn>
                 <v-btn color="red darken-1" text variant="tonal" @click="deleteTag">{{
                     $t('common.delete') }}</v-btn>
@@ -70,71 +69,96 @@
         </v-card>
     </v-dialog>
 
-    <v-dialog scrollable v-model="dialog" max-width="750px">
+    <v-dialog scrollable v-model="dialogEditTag" max-width="750px">
         <v-card>
             <v-card-title>
                 <span class="headline">{{ $t('admin.tags.editTag') }}</span>
             </v-card-title>
 
             <v-card-text>
-                <v-text-field v-model="editedItem._id" :label="$t('admin.tags.editId')"></v-text-field>
-                <v-text-field v-model="editedItem.tag" :label="$t('admin.tags.editName')"></v-text-field>
-                <v-text-field v-model="editedItem.description" :label="$t('admin.tags.editDescription')"></v-text-field>
-                <v-text-field v-model="editedItem.group1" :label="$t('admin.tags.editGroup1')"></v-text-field>
-                <v-text-field v-model="editedItem.group2" :label="$t('admin.tags.editGroup2')"></v-text-field>
-                <v-text-field v-model="editedItem.group3" :label="$t('admin.tags.editGroup3')"></v-text-field>
+                <v-text-field v-model="editedTag._id" :label="$t('admin.tags.editId')"></v-text-field>
+                <v-text-field v-model="editedTag.tag" :label="$t('admin.tags.editName')"></v-text-field>
+                <v-text-field v-model="editedTag.description" :label="$t('admin.tags.editDescription')"></v-text-field>
+                <v-text-field v-model="editedTag.ungroupedDescription"
+                    :label="$t('admin.tags.editUngroupedDescription')"></v-text-field>
+                <v-text-field v-model="editedTag.group1" :label="$t('admin.tags.editGroup1')"></v-text-field>
+                <v-text-field v-model="editedTag.group2" :label="$t('admin.tags.editGroup2')"></v-text-field>
+                <v-text-field v-model="editedTag.group3" :label="$t('admin.tags.editGroup3')"></v-text-field>
                 <v-select :items="['supervised', 'command', 'calculated', 'manual']"
-                    :label="$t('admin.tags.editOrigin')" v-model="editedItem.origin" class="ma-0"></v-select>
+                    :label="$t('admin.tags.editOrigin')" v-model="editedTag.origin" class="ma-0"></v-select>
+                <v-text-field type="number" v-if="editedTag.origin === 'calculated'" v-model="editedTag.formula" min="0"
+                    :label="$t('admin.tags.editFormula')"></v-text-field>
+                <v-row v-if="editedTag.origin === 'calculated' && editedTag.formula > 0">
+                    <v-col>
+                        <v-select v-model="editedTag.parcels" :items="editedTag.parcels"
+                            :label="$t('admin.tags.editParcels')" multiple></v-select>
+                    </v-col>
+                    <v-col>
+                        <v-btn color="blue darken-1" text variant="tonal" @click="dialogAddParcel = true">
+                            <v-icon dark> mdi-plus </v-icon>
+                            {{ $t('admin.tags.parcelAddNew') }}
+                        </v-btn>
+                    </v-col>
+                </v-row>
+
+
+                <v-text-field type="number" v-model="editedTag.priority" min="0" max="3"
+                    :label="$t('admin.tags.editPriority')"></v-text-field>
+
                 <v-select :items="['digital', 'analog', 'string', 'json']" :label="$t('admin.tags.editType')"
-                    v-model="editedItem.type" class="ma-0"></v-select>
-                <v-text-field v-if="editedItem.type == 'digital'" v-model="editedItem.stateTextFalse"
+                    v-model="editedTag.type" class="ma-0"></v-select>
+                <v-text-field v-if="editedTag.type == 'digital'" v-model="editedTag.stateTextFalse"
                     :label="$t('admin.tags.editStateTextFalse')"></v-text-field>
-                <v-text-field v-if="editedItem.type == 'digital'" v-model="editedItem.stateTextTrue"
+                <v-text-field v-if="editedTag.type == 'digital'" v-model="editedTag.stateTextTrue"
                     :label="$t('admin.tags.editStateTextTrue')"></v-text-field>
-                <v-text-field v-if="editedItem.type == 'digital'" v-model="editedItem.eventTextFalse"
+                <v-text-field v-if="editedTag.type == 'digital'" v-model="editedTag.eventTextFalse"
                     :label="$t('admin.tags.editEventTextFalse')"></v-text-field>
-                <v-text-field v-if="editedItem.type == 'digital'" v-model="editedItem.eventTextTrue"
+                <v-text-field v-if="editedTag.type == 'digital'" v-model="editedTag.eventTextTrue"
                     :label="$t('admin.tags.editEventTextTrue')"></v-text-field>
-                <v-text-field v-if="editedItem.type == 'analog'" v-model="editedItem.unit"
+                <v-text-field v-if="editedTag.type == 'analog'" v-model="editedTag.unit"
                     :label="$t('admin.tags.editUnit')"></v-text-field>
 
-                <v-text-field type="number" v-if="['supervised'].includes(editedItem.origin)"
-                    v-model="editedItem.commandOfSupervised"
+                <v-text-field type="number" v-if="['supervised'].includes(editedTag.origin)"
+                    v-model="editedTag.commandOfSupervised"
                     :label="$t('admin.tags.editCommandOfSupervised')"></v-text-field>
-                <v-text-field type="number" v-if="['command'].includes(editedItem.origin)"
-                    v-model="editedItem.supervisedOfCommand"
+                <v-text-field type="number" v-if="['command'].includes(editedTag.origin)"
+                    v-model="editedTag.supervisedOfCommand"
                     :label="$t('admin.tags.editSupervisedOfCommand')"></v-text-field>
-                <v-text-field type="number" v-if="['supervised'].includes(editedItem.origin)"
-                    v-model="editedItem.invalidDetectTimeout"
+                <v-text-field type="number" v-if="['supervised'].includes(editedTag.origin)"
+                    v-model="editedTag.invalidDetectTimeout"
                     :label="$t('admin.tags.editInvalidDetectTimeout')"></v-text-field>
+                <v-text-field type="number" v-if="editedTag.type === 'analog'" v-model="editedTag.frozenDetectTimeout"
+                    :label="$t('admin.tags.editFrozenDetectTimeout')"></v-text-field>
 
                 <v-select :items="protocolConnections" :label="$t('admin.tags.editProtocolSourceConnectionNumber')"
                     :item-title="item => `${item.protocolConnectionNumber} | ${item.name}`"
                     :item-value="item => item.protocolConnectionNumber"
-                    v-if="['supervised', 'command'].includes(editedItem.origin)"
-                    v-model="editedItem.protocolSourceConnectionNumber" class="ma-0"></v-select>
+                    v-if="['supervised', 'command'].includes(editedTag.origin)"
+                    v-model="editedTag.protocolSourceConnectionNumber" class="ma-0"></v-select>
 
-                <v-text-field v-if="['supervised', 'command'].includes(editedItem.origin)"
-                    v-model="editedItem.protocolSourceASDU"
+                <v-text-field v-if="['supervised', 'command'].includes(editedTag.origin)"
+                    v-model="editedTag.protocolSourceASDU"
                     :label="$t('admin.tags.editProtocolSourceASDU')"></v-text-field>
-                <v-text-field v-if="['supervised', 'command'].includes(editedItem.origin)"
-                    v-model="editedItem.protocolSourceCommonAddress"
+                <v-text-field v-if="['supervised', 'command'].includes(editedTag.origin)"
+                    v-model="editedTag.protocolSourceCommonAddress"
                     :label="$t('admin.tags.editProtocolSourceCommonAddress')"></v-text-field>
-                <v-text-field v-if="['supervised', 'command'].includes(editedItem.origin)"
-                    v-model="editedItem.protocolSourceObjectAddress"
+                <v-text-field v-if="['supervised', 'command'].includes(editedTag.origin)"
+                    v-model="editedTag.protocolSourceObjectAddress"
                     :label="$t('admin.tags.editProtocolSourceObjectAddress')"></v-text-field>
 
-                <v-text-field v-if="['command'].includes(editedItem.origin)"
-                    v-model="editedItem.protocolSourceCommandDuration"
+                <v-text-field type="number" v-if="['command'].includes(editedTag.origin)" min="0"
+                    v-model="editedTag.protocolSourceCommandDuration"
                     :label="$t('admin.tags.editProtocolSourceCommandDuration')"></v-text-field>
 
-                <v-text-field type="number" v-if="['supervised', 'command'].includes(editedItem.origin)"
-                    v-model="editedItem.kconv1" :label="$t('admin.tags.editKconv1')"></v-text-field>
-                <v-text-field type="number" v-if="['supervised', 'command'].includes(editedItem.origin)"
-                    v-model="editedItem.kconv2" :label="$t('admin.tags.editKconv2')"></v-text-field>
+                <v-text-field type="number" v-if="editedTag.origin !== 'command' && editedTag.type === 'analog'" min="0"
+                    v-model="editedTag.historianDeadBand"
+                    :label="$t('admin.tags.editHistorianDeadBand')"></v-text-field>
+
+                <v-text-field type="number" v-if="editedTag.origin !== 'command'" min="0"
+                    v-model="editedTag.historianPeriod" :label="$t('admin.tags.editHistorianPeriod')"></v-text-field>
 
                 <v-switch v-if="
-                    ['command'].includes(editedItem.origin) &&
+                    ['command'].includes(editedTag.origin) &&
                     [
                         '45',
                         '46',
@@ -147,31 +171,142 @@
                         '2',
                         '3',
                         '4',
-                    ].includes('' + editedItem.protocolSourceASDU)
-                " v-model="editedItem.protocolSourceCommandUseSBO" inset color="primary" :label="`${$t('admin.tags.editProtocolSourceCommandUseSBO')}${editedItem.protocolSourceCommandUseSBO
+                    ].includes('' + editedTag.protocolSourceASDU)
+                " v-model="editedTag.protocolSourceCommandUseSBO" inset color="primary" :label="`${$t('admin.tags.editProtocolSourceCommandUseSBO')}${editedTag.protocolSourceCommandUseSBO
                     ? $t('admin.tags.editProtocolSourceCommandUseSBOTrue')
                     : $t('admin.tags.editProtocolSourceCommandUseSBOFalse')
                     }`" class="mt-0"></v-switch>
 
-                <v-switch v-if="['supervised'].includes(editedItem.origin)" v-model="editedItem.isEvent" inset
-                    color="primary" :label="`${$t('admin.tags.editIsEvent')}${editedItem.isEvent
+                <v-text-field type="number" v-if="['supervised', 'command'].includes(editedTag.origin)"
+                    v-model="editedTag.kconv1" :label="$t('admin.tags.editKconv1')"></v-text-field>
+                <v-text-field type="number" v-if="['supervised', 'command'].includes(editedTag.origin)"
+                    v-model="editedTag.kconv2" :label="$t('admin.tags.editKconv2')"></v-text-field>
+
+
+                <v-switch v-if="['supervised'].includes(editedTag.origin)" v-model="editedTag.isEvent" inset
+                    color="primary" :label="`${$t('admin.tags.editIsEvent')}${editedTag.isEvent
                         ? $t('admin.tags.editIsEventTrue')
                         : $t('admin.tags.editIsEventFalse')
                         }`" class="mt-0"></v-switch>
+
+                <v-row>
+                    <v-col>
+                        <v-select v-model="editedTag.protocolDestinations" :items="editedTag.protocolDestinations"
+                            :item-title="item => `
+                            CN:${item.protocolDestinationConnectionNumber} | 
+                            OA:${item.protocolDestinationObjectAddress} |
+                            CA:${item.protocolDestinationCommonAddress} | 
+                            AS:${item.protocolDestinationASDU} 
+                            `" :item-value="item => item" chips small-chips closable-chips
+                            :label="$t('admin.tags.protocolDestinations')" multiple></v-select>
+                    </v-col>
+                    <v-col>
+                        <v-btn color="blue darken-1" text variant="tonal" @click="dialogAddProtocolDestination = true">
+                            <v-icon dark> mdi-plus </v-icon>
+                            {{ $t('admin.tags.protocolDestinationAddNew') }}
+                        </v-btn>
+                    </v-col>
+                </v-row>
+
             </v-card-text>
 
             <v-card-actions>
+                <v-chip v-if="error" color="red darken-1">{{ $t('common.error') }}</v-chip>
                 <v-spacer></v-spacer>
-                <v-btn color="orange darken-1" text variant="tonal" @click="close">
+                <v-btn color="orange darken-1" text variant="tonal" @click="closeEditTag">
                     {{ $t('common.cancel') }}
                 </v-btn>
-                <v-btn color="blue darken-1" text variant="tonal" @click="save">
+                <v-btn color="blue darken-1" text variant="tonal" @click="updateTag">
                     {{ $t('common.save') }}
                 </v-btn>
             </v-card-actions>
         </v-card>
     </v-dialog>
 
+    <v-dialog scrollable v-model="dialogAddProtocolDestination" max-width="400" class="pa-8">
+        <v-card>
+            <v-card-title class="headline">
+                {{ $t("admin.tags.protocolDestinationAddNew") }}
+            </v-card-title>
+
+            <v-card-text>
+                <v-select :items="protocolConnectionsDestinations"
+                    :label="$t('admin.tags.protocolDestinationConnectionNumber')"
+                    :item-title="item => `${item.protocolConnectionNumber} | ${item.name}`"
+                    :item-value="item => item.protocolConnectionNumber"
+                    v-model="newProtocolDestination.protocolDestinationConnectionNumber" class="ma-0"></v-select>
+
+                <v-text-field :label="$t('admin.tags.protocolDestinationCommonAddress')" type="number" min="0"
+                    v-model="newProtocolDestination.protocolDestinationCommonAddress"></v-text-field>
+
+                <v-text-field :label="$t('admin.tags.protocolDestinationObjectAddress')" type="number" min="0"
+                    v-model="newProtocolDestination.protocolDestinationObjectAddress"></v-text-field>
+
+                <v-text-field :label="$t('admin.tags.protocolDestinationASDU')" type="number" min="0"
+                    v-model="newProtocolDestination.protocolDestinationASDU"></v-text-field>
+
+                <v-text-field
+                    v-if="newProtocolDestination.protocolDestinationASDU >= 45 && newProtocolDestination.protocolDestinationASDU <= 64"
+                    :label="$t('admin.tags.protocolDestinationCommandDuration')" type="number" min="0"
+                    v-model="newProtocolDestination.protocolDestinationCommandDuration"></v-text-field>
+
+                <v-switch
+                    v-if="newProtocolDestination.protocolDestinationASDU >= 45 && newProtocolDestination.protocolDestinationASDU <= 64"
+                    v-model="newProtocolDestination.protocolDestinationCommandUseSBO" inset color="primary" :label="`${$t('admin.tags.protocolDestinationCommandUseSBO')}${newProtocolDestination.protocolDestinationCommandUseSBO
+                        ? ': ' + $t('common.true')
+                        : ': ' + $t('common.false')
+                        }`" class="mt-n3"></v-switch>
+
+                <v-text-field :label="$t('admin.tags.protocolDestinationKConv1')" type="number"
+                    v-model="newProtocolDestination.protocolDestinationKConv1"></v-text-field>
+
+                <v-text-field :label="$t('admin.tags.protocolDestinationKConv2')" type="number"
+                    v-model="newProtocolDestination.protocolDestinationKConv2"></v-text-field>
+
+                <v-text-field :label="$t('admin.tags.protocolDestinationGroup')" type="number" min="0"
+                    v-model="newProtocolDestination.protocolDestinationGroup"></v-text-field>
+
+                <v-text-field :label="$t('admin.tags.protocolDestinationHoursShift')" type="number"
+                    v-model="newProtocolDestination.protocolDestinationHoursShift"></v-text-field>
+            </v-card-text>
+
+            <v-card-actions>
+                <v-spacer></v-spacer>
+                <v-btn color="orange darken-1" text variant="tonal" @click="dialogAddProtocolDestination = false">
+                    {{ $t("common.cancel") }}
+                </v-btn>
+                <v-btn color="blue darken-1" text variant="tonal" @click="addNewProtocolDestination">
+                    {{ $t("common.ok") }}
+                </v-btn>
+            </v-card-actions>
+        </v-card>
+    </v-dialog>
+
+    <v-dialog scrollable v-model="dialogAddParcel" max-width="400" class="pa-8">
+        <v-card>
+            <v-card-title class="headline">
+                {{ $t("admin.tags.parcelAddNew") }}
+            </v-card-title>
+
+            <v-card-text>
+
+                <v-text-field :label="$t('admin.tags.parcelNew')" type="number" min="0"
+                    v-model="newParcel"></v-text-field>
+
+            </v-card-text>
+
+            <v-card-actions>
+                <v-spacer></v-spacer>
+                <v-btn color="orange darken-1" text variant="tonal" @click="dialogAddParcel = false">
+                    {{ $t("common.cancel") }}
+                </v-btn>
+                <v-btn color="blue darken-1" text variant="tonal" @click="addNewParcel">
+                    {{ $t("common.ok") }}
+                </v-btn>
+            </v-card-actions>
+        </v-card>
+    </v-dialog>
+
 </template>
 
 <script setup>
@@ -180,10 +315,13 @@ import { useI18n } from 'vue-i18n'
 
 const { t } = useI18n()
 
-const dialog = ref(false)
-const dialogDelete = ref(false)
+const dialogEditTag = ref(false)
+const dialogDeleteTag = ref(false)
+const dialogAddParcel = ref(false)
 const tags = ref([])
 const protocolConnections = ref([])
+const protocolDriveNameByConnNumber = ref([])
+const protocolConnectionsDestinations = ref([])
 const totalTags = ref(0)
 const searchTag = ref('')
 const searchDescription = ref('')
@@ -192,19 +330,44 @@ const itemsPerPage = ref(10)
 const page = ref(1)
 const sortBy = ref([])
 const sortDesc = ref([])
-
-const editedIndex = ref(-1)
-const editedItem = reactive({
+const dialogAddProtocolDestination = ref(false);
+const newParcel = ref(0)
+const newProtocolDestination = ref({
+    "protocolDestinationConnectionNumber": 0,
+    "protocolDestinationCommonAddress": 0,
+    "protocolDestinationObjectAddress": 0,
+    "protocolDestinationASDU": 0,
+    "protocolDestinationCommandDuration": 0,
+    "protocolDestinationCommandUseSBO": false,
+    "protocolDestinationKConv1": 1,
+    "protocolDestinationKConv2": 0,
+    "protocolDestinationGroup": 0,
+    "protocolDestinationHoursShift": 0
+});
+const error = ref(false);
+
+const defaultTagValue = ref({
     tag: '',
     description: '',
+    ungroupedDescription: '',
     group1: '',
+    group2: '',
+    group3: '',
+    origin: 'supervised',
+    type: 'digital',
+    commandOfSupervised: 0,
+    supervisedOfCommand: 0,
+    invalidDetectTimeout: 3600,
+    frozenDetectTimeout: 0,
+    formula: 0,
+    priority: 0,
+    parcels: [],
+    protocolDestinations: [],
+    protocolSourceASDU: "0",
+    historianDeadBand: 0,
+    historianPeriod: 0,
 })
-
-const defaultItem = {
-    tag: '',
-    description: '',
-    group1: '',
-}
+const editedTag = ref({...defaultTagValue.value})
 
 const headers = computed(() => [
     {
@@ -256,36 +419,26 @@ const handleOptionsUpdate = (newOptions) => {
     fetchTags()
 }
 
-const newTag = async () => {
-    try {
-        const response = await fetch('/Invoke/auth/createTag', {
-            method: 'post',
-            headers: {
-                Accept: 'application/json',
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({ tag: 'a_new_tag' }),
-        })
-        const json = await response.json()
-        if (json.error) console.log(json)
+const newTagOpenDialog = async () => {
+    error.value = false;
+    editedTag.value = Object.assign({}, defaultTagValue.value);
+    await fetchProtocolConnections()
+    dialogEditTag.value = true;
+}
 
-        sortBy.value = ['_id']
-        sortDesc.value = [true]
-        await fetchTags()
-    } catch (err) {
-        console.warn(err)
-    }
+const editTagOpenDialog = async (item) => {
+    error.value = false;
+    editedTag.value = Object.assign({}, item);
+    await fetchProtocolConnections()
+    dialogEditTag.value = true
 }
 
-const editTag = (item) => {
-    fetchProtocolConnections();
-    editedIndex.value = tags.value.indexOf(item)
-    Object.assign(editedItem, item)
-    dialog.value = true
+const deleteTagOpenDialog = (item) => {
+    editedTag.value = Object.assign({}, item)
+    dialogDeleteTag.value = true
 }
 
 const deleteTag = async () => {
-    dialogDelete.value = false
     try {
         const response = await fetch('/Invoke/auth/deleteTag', {
             method: 'post',
@@ -294,61 +447,46 @@ const deleteTag = async () => {
                 'Content-Type': 'application/json',
             },
             body: JSON.stringify({
-                tag: editedItem.tag,
-                _id: editedItem._id,
+                tag: editedTag.tag,
+                _id: editedTag._id,
             }),
         })
         const json = await response.json()
-        if (json.error) console.log(json)
-        fetchTags()
+        if (json.error) { console.warn(json); error.value = true; return; }
+        dialogDeleteTag.value = false
     } catch (err) {
         console.warn(err)
+        error.value = true
     }
+    fetchTags()
 }
 
-const deleteTagOpenDialog = (item) => {
-    editedIndex.value = tags.value.indexOf(item)
-    Object.assign(editedItem, item)
-    dialogDelete.value = true
-}
-
-const close = () => {
-    dialog.value = false
-    nextTick(() => {
-        Object.assign(editedItem, defaultItem)
-        editedIndex.value = -1
-    })
+const closeEditTag = () => {
+    dialogEditTag.value = false
 }
 
-const closeDelete = () => {
-    dialogDelete.value = false
-    nextTick(() => {
-        Object.assign(editedItem, defaultItem)
-        editedIndex.value = -1
-    })
+const closeDeleteTag = () => {
+    dialogDeleteTag.value = false
 }
 
-const save = async () => {
-    if (editedIndex.value > -1) {
-        try {
-            const response = await fetch('/Invoke/auth/updateTag', {
-                method: 'post',
-                headers: {
-                    Accept: 'application/json',
-                    'Content-Type': 'application/json',
-                },
-                body: JSON.stringify(editedItem),
-            })
-            const json = await response.json()
-            if (json.error) console.log(json)
-            close()
-            fetchTags()
-        } catch (err) {
-            console.warn(err)
-            close()
-        }
+const updateTag = async () => {
+    try {
+        const response = await fetch('/Invoke/auth/updateTag', {
+            method: 'post',
+            headers: {
+                Accept: 'application/json',
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify(editedTag),
+        })
+        const json = await response.json()
+        if (json.error) { console.log(json); error.value = true; }
+        closeEditTag()
+    } catch (err) {
+        console.warn(err)
+        error.value = true
     }
-    close()
+    fetchTags()
 }
 
 const fetchTags = async () => {
@@ -380,6 +518,7 @@ const fetchTags = async () => {
         totalTags.value = json.countTotal
     } catch (err) {
         console.warn(err)
+        error.value = true
     } finally {
         loading.value = false
     }
@@ -397,10 +536,28 @@ const fetchProtocolConnections = async () => {
             json[i].id = i + 1;
         }
         protocolConnections.value = json;
+        protocolConnectionsDestinations.value = []
+        protocolConnections.value.forEach((item) => {
+            if (item.protocolDriver === 'IEC60870-5-104_SERVER' || item.protocolDriver === 'IEC60870-5-101_SERVER') {
+                protocolConnectionsDestinations.value.push(item)
+            }
+            protocolDriveNameByConnNumber[item.protocolConnectionNumber] = item.name
+        })
     } catch (err) {
-        console.warn(err);
+        console.warn(err)
+        error.value = true
     }
 };
 
+const addNewProtocolDestination = async () => {
+    editedTag.protocolDestinations.push(newProtocolDestination.value)
+    dialogAddProtocolDestination.value = false
+};
+
+const addNewParcel = async () => {
+    editedTag.parcels.push(newParcel.value)
+    dialogAddParcel.value = false
+};
+
 defineExpose({ fetchTags })
 </script>
diff --git a/src/AdminUI/src/locales/en.json b/src/AdminUI/src/locales/en.json
index 94ab3bb3..f081e857 100644
--- a/src/AdminUI/src/locales/en.json
+++ b/src/AdminUI/src/locales/en.json
@@ -531,11 +531,14 @@
       "editId": "Tag _id (unique numeric point key)",
       "editName": "Tag name (unique string key)",
       "editDescription": "Description",
+      "editUngroupedDescription": "Ungrouped Description",
       "editGroup1": "Group 1 (e.g.Installation/Plant)",
       "editGroup2": "Group 2 (e.g.Area/Bay)",
       "editGroup3": "Group 3 (e.g.Equipment/Device)",
       "editOrigin": "Origin",
       "editType": "Type",
+      "editHistorianDeadBand": "Historian Dead-band (%)",
+      "editHistorianPeriod": "Historian Integrity Period (s)",
       "editStateTextTrue": "Text for state true",
       "editStateTextFalse": "Text for state false",
       "editEventTextTrue": "Text for event true",
@@ -544,6 +547,12 @@
       "editCommandOfSupervised": "Command point of supervised (use zero for none)",
       "editSupervisedOfCommand": "Supervised point of command (use zero for none)",
       "editInvalidDetectTimeout": "Invalid detect timeout (seconds)",
+      "editFrozenDetectTimeout": "Frozen detect timeout (seconds)",
+      "editFormula": "Formula Code",
+      "editPriority": "Priority",     
+      "editParcels": "Parcels of calculation",
+      "parcelAddNew": "Add new parcel",
+      "parcelNew": "New parcel",
       "editProtocolSourceConnectionNumber": "Protocol source: connection number",
       "editProtocolSourceASDU": "Protocol source: ASDU type",
       "editProtocolSourceCommonAddress": "Protocol source: common address",
@@ -557,6 +566,18 @@
       "editIsEvent": "Is event: ",
       "editIsEventTrue": "True",
       "editIsEventFalse": "False",
+      "protocolDestinations":  "Protocol Destinations",
+      "protocolDestinationAddNew": "Add destination",
+      "protocolDestinationConnectionNumber": "Connection Number",
+      "protocolDestinationASDU": "ASDU TI Type",
+      "protocolDestinationCommonAddress": "Common Address",
+      "protocolDestinationObjectAddress": "Object Address",
+      "protocolDestinationCommandDuration": "Command Duration",
+      "protocolDestinationCommandUseSBO": "Command Use SBO",
+      "protocolDestinationKConv1": "Conversion factor: multiplier (kconv1)",
+      "protocolDestinationKConv2": "Conversion factor: adder (kconv2)",
+      "protocolDestinationGroup": "Group",
+      "protocolDestinationHoursShift": "Timestamps shift in hours",
       "headers": {
         "tag": "Tag",
         "id": "Point Key",
@@ -605,6 +626,7 @@
     "editCommandOfSupervised": "Command point of supervised (use zero for none)",
     "editSupervisedOfCommand": "Supervised point of command (use zero for none)",
     "editInvalidDetectTimeout": "Invalid detect timeout (seconds)",
+    "editFrozenDetectTimeout": "Frozen detect timeout (seconds)",
     "editProtocolSourceConnectionNumber": "Protocol source: connection number",
     "editProtocolSourceASDU": "Protocol source: ASDU type",
     "editProtocolSourceCommonAddress": "Protocol source: common address",