diff --git a/.resources/3a26af142442028e4e1fdf54296ec637b6da58259dbf94b3f9ca9483afde052a b/.resources/2e0881f570fc4f5c50d52eb39ff85df05145736fa303736c6c9a53a78c21d2fd
similarity index 95%
rename from .resources/3a26af142442028e4e1fdf54296ec637b6da58259dbf94b3f9ca9483afde052a
rename to .resources/2e0881f570fc4f5c50d52eb39ff85df05145736fa303736c6c9a53a78c21d2fd
index 881b1bad..6f60d0be 100644
--- a/.resources/3a26af142442028e4e1fdf54296ec637b6da58259dbf94b3f9ca9483afde052a
+++ b/.resources/2e0881f570fc4f5c50d52eb39ff85df05145736fa303736c6c9a53a78c21d2fd
@@ -221,7 +221,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tsystem.perspective.openDock(\u0027Docked-East-PE\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"
diff --git a/.resources/c8e51d99334f4b2ebd0bf73668b43e5b7a30b5635e40fae68b76ee62d3dd20a7 b/.resources/45f755ad3f636fe2d18007d80d6170e64144bf8329019c8ca8f688d5a3fb07d1
similarity index 57%
rename from .resources/c8e51d99334f4b2ebd0bf73668b43e5b7a30b5635e40fae68b76ee62d3dd20a7
rename to .resources/45f755ad3f636fe2d18007d80d6170e64144bf8329019c8ca8f688d5a3fb07d1
index 1c5075a1..d6c933bb 100644
--- a/.resources/c8e51d99334f4b2ebd0bf73668b43e5b7a30b5635e40fae68b76ee62d3dd20a7
+++ b/.resources/45f755ad3f636fe2d18007d80d6170e64144bf8329019c8ca8f688d5a3fb07d1
@@ -1,14 +1,7 @@
 {
   "custom": {
-    "covert_mode": null,
     "disconnected": false,
-    "display_icon": null,
-    "error": false,
-    "isMatch": 0,
     "priority": 0,
-    "priority_string": "No active alarms",
-    "running_status": 0,
-    "searchId": null,
     "state": 5,
     "state_string": "Unknown"
   },
@@ -27,21 +20,6 @@
     ]
   },
   "propConfig": {
-    "custom.covert_mode": {
-      "binding": {
-        "config": {
-          "path": "view.custom.state"
-        },
-        "transforms": [
-          {
-            "expression": "case(\t{value},\r\n\t\t0, {session.custom.alarm_filter.show_running},\r\n\t\t1, True,\r\n\t\t2, True,\r\n\t\t3, {session.custom.alarm_filter.show_low_alarm},\r\n\t\t4, {session.custom.alarm_filter.show_diagnostic},\r\n\t\t5, {session.custom.alarm_filter.show_running},\r\n\t\tFalse)",
-            "type": "expression"
-          }
-        ],
-        "type": "property"
-      },
-      "persistent": true
-    },
     "custom.disconnected": {
       "binding": {
         "config": {
@@ -63,39 +41,6 @@
       },
       "persistent": true
     },
-    "custom.display_icon": {
-      "binding": {
-        "config": {
-          "expression": "{this.custom.covert_mode}//||{this.custom.isMatch}\u003e0"
-        },
-        "type": "expr"
-      },
-      "persistent": true
-    },
-    "custom.error": {
-      "binding": {
-        "config": {
-          "path": "view.custom.state"
-        },
-        "transforms": [
-          {
-            "expression": "0 \u003c {value} \u0026\u0026 {value} \u003c 5",
-            "type": "expression"
-          }
-        ],
-        "type": "property"
-      },
-      "persistent": true
-    },
-    "custom.isMatch": {
-      "binding": {
-        "config": {
-          "expression": "if({view.params.tagProps[0]}\u003d\"value\",0,\nif({this.custom.searchId}\u003d{view.params.tagProps[0]},100,0))"
-        },
-        "type": "expr"
-      },
-      "persistent": true
-    },
     "custom.priority": {
       "binding": {
         "config": {
@@ -131,16 +76,7 @@
       },
       "persistent": true
     },
-    "custom.priority_string": {
-      "binding": {
-        "config": {
-          "expression": "case({view.custom.state},\r\n1, \"High\",\r\n2, \"Medium\",\r\n3, \"Low\",\r\n4, \"Diagnostic\",\r\n5, \"No active alarms\",\r\n\"Unknown\")"
-        },
-        "type": "expr"
-      },
-      "persistent": true
-    },
-    "custom.running_status": {
+    "custom.state": {
       "binding": {
         "config": {
           "fallbackDelay": 2.5,
@@ -153,7 +89,7 @@
         },
         "transforms": [
           {
-            "expression": "coalesce({value},{view.params.forceRunningStatus},0)",
+            "expression": "coalesce({value},0)",
             "type": "expression"
           }
         ],
@@ -161,68 +97,10 @@
       },
       "persistent": true
     },
-    "custom.searchId": {
-      "binding": {
-        "config": {
-          "path": "session.custom.searchId"
-        },
-        "type": "property"
-      },
-      "persistent": true
-    },
-    "custom.state": {
-      "binding": {
-        "config": {
-          "fallbackDelay": 2.5,
-          "mode": "indirect",
-          "references": {
-            "0": "{view.params.tagProps[0]}",
-            "fc": "{session.custom.fc}"
-          },
-          "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/ALARMST"
-        },
-        "transforms": [
-          {
-            "expression": "coalesce({value},{view.params.forceFaultStatus},0)",
-            "type": "expression"
-          },
-          {
-            "fallback": null,
-            "inputType": "scalar",
-            "mappings": [
-              {
-                "input": 4,
-                "output": 1
-              },
-              {
-                "input": 3,
-                "output": 2
-              },
-              {
-                "input": 2,
-                "output": 3
-              },
-              {
-                "input": 1,
-                "output": 4
-              },
-              {
-                "input": 0,
-                "output": 5
-              }
-            ],
-            "outputType": "scalar",
-            "type": "map"
-          }
-        ],
-        "type": "tag"
-      },
-      "persistent": true
-    },
     "custom.state_string": {
       "binding": {
         "config": {
-          "expression": "case({view.custom.running_status},\r\n1, \"Faulted\",\r\n2, \"Stopped\",\r\n3, \"Running\",\r\n\"Unknown\")"
+          "expression": "case({view.custom.state},\r\n1, \"Faulted\",\r\n2, \"Stopped\",\r\n3, \"Running\",\r\n\"Unknown\")"
         },
         "type": "expr"
       },
@@ -268,68 +146,6 @@
               ],
               "type": "property"
             }
-          },
-          "props.style.classes": {
-            "binding": {
-              "config": {
-                "expression": "if({session.custom.colours.colour_impaired} \u003d True \u0026\u0026 {view.custom.isMatch} \u003e 0,\r\n{view.custom.state} + 100 + {view.custom.isMatch},\r\n{view.custom.state} + {view.custom.isMatch})"
-              },
-              "transforms": [
-                {
-                  "fallback": "",
-                  "inputType": "scalar",
-                  "mappings": [
-                    {
-                      "input": 101,
-                      "output": "State-Styles/State101"
-                    },
-                    {
-                      "input": 102,
-                      "output": "State-Styles/State102"
-                    },
-                    {
-                      "input": 103,
-                      "output": "State-Styles/State103"
-                    },
-                    {
-                      "input": 104,
-                      "output": "State-Styles/State104"
-                    },
-                    {
-                      "input": 105,
-                      "output": "State-Styles/State105"
-                    },
-                    {
-                      "input": 106,
-                      "output": "State-Styles/State106"
-                    },
-                    {
-                      "input": 201,
-                      "output": "State-Styles/State201"
-                    },
-                    {
-                      "input": 202,
-                      "output": "State-Styles/State202"
-                    },
-                    {
-                      "input": 203,
-                      "output": "State-Styles/State203"
-                    },
-                    {
-                      "input": 204,
-                      "output": "State-Styles/State204"
-                    },
-                    {
-                      "input": 205,
-                      "output": "State-Styles/State205"
-                    }
-                  ],
-                  "outputType": "style-list",
-                  "type": "map"
-                }
-              ],
-              "type": "expr"
-            }
           }
         },
         "props": {
@@ -399,7 +215,6 @@
           "fill": {
             "paint": "#000000"
           },
-          "style": {},
           "viewBox": "0 0 29.22 29.22"
         },
         "type": "ia.shapes.svg"
@@ -409,22 +224,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tsystem.perspective.openDock(\u0027Docked-East\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})"
-          },
-          "scope": "G",
-          "type": "script"
-        },
-        "onDoubleClick": {
-          "config": {
-            "script": "\ttagProps \u003d self.view.params.tagProps\n\tsystem.perspective.openPopup(\"StatusPopUP\", \"PopUp-Views/Controller-Equipment/Information\", params \u003d{\"tagProps\":tagProps})\n\t"
-          },
-          "enabled": false,
-          "scope": "G",
-          "type": "script"
-        },
-        "onMouseEnter": {
-          "config": {
-            "script": "\tfrom time import sleep\n\t\n\talarm \u003d []\n\tmessage \u003d None\n\t\n\tsleep(0.5)\n\t\n\tif system.tag.exists(\"System/aws_data\"):\n\t\tif self.view.params.tagProps[0] !\u003d \"\":\n\t\t\ttags_to_read \u003d system.tag.readBlocking(\"System/aws_data\")\n\t\t\tdecode_alarm_data \u003d system.util.jsonDecode(tags_to_read[0].value)\n\t\t\talarm \u003d [decode_alarm_data[i] for i in decode_alarm_data\n\t\t\t\t\tif decode_alarm_data[i][\u0027sourceId\u0027].startswith(self.view.params.tagProps[0])]\n\t\tif alarm:\n\t\t\talarm \u003d sorted(alarm, key \u003d lambda t:t[\u0027timestamp\u0027], reverse\u003dTrue)\n\t\t\tmessage \u003d max(alarm, key \u003d lambda p:p[\u0027priority\u0027]).get(\u0027message\u0027)\n\t\t\tif len(alarm) \u003e 1:\n\t\t\t\tmessage +\u003d \" (+\" + str(len(alarm)-1) + \")\"\n\tself.view.custom.alarm_message \u003d message"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"
@@ -505,7 +305,7 @@
       "meta.tooltip.text": {
         "binding": {
           "config": {
-            "expression": "if({view.custom.disconnected} \u003d False,\n\tif(isNull({view.custom.alarm_message}),\n\t\"Source Id: \" + {view.params.tagProps[0]} +\n\t\", Priority: \" + {view.custom.priority_string} +\n\t\", State: \" + {view.custom.state_string},\n\t\"Source Id: \" + {view.params.tagProps[0]} +\n\t\", Alarm: \" + {view.custom.alarm_message} +\n\t\", Priority: \" + {view.custom.priority_string} +\n\t\", State: \" + {view.custom.state_string}),\n\"Source Id: \" +{view.params.tagProps[0]} + \", Priority: Unknown, State: Unknown\")"
+            "expression": "if({view.custom.disconnected} \u003d False,\n\tif(isNull({view.custom.alarm_message}),\n\t\"Source Id: \" + {view.params.tagProps[0]} +\n\t\", State: \" + {view.custom.state_string},\n\t\"Source Id: \" + {view.params.tagProps[0]} +\n\t\", Priority: \" + {view.custom.priority_string} +\n\t\", State: \" + {view.custom.state_string}),\n\"Source Id: \" +{view.params.tagProps[0]} + \", Priority: Unknown, State: Unknown\")"
           },
           "type": "expr"
         }
diff --git a/.resources/ac39d67f473d8fd3cc5c4d318a50097577c1c697aa5c91581ed883123c24498d b/.resources/683a28ec106c12f3b8288ec28a5f738f4ebf4830e6b96f11ed4877ed38e6e8ed
similarity index 80%
rename from .resources/ac39d67f473d8fd3cc5c4d318a50097577c1c697aa5c91581ed883123c24498d
rename to .resources/683a28ec106c12f3b8288ec28a5f738f4ebf4830e6b96f11ed4877ed38e6e8ed
index cb104411..59c26bef 100644
--- a/.resources/ac39d67f473d8fd3cc5c4d318a50097577c1c697aa5c91581ed883123c24498d
+++ b/.resources/683a28ec106c12f3b8288ec28a5f738f4ebf4830e6b96f11ed4877ed38e6e8ed
@@ -177,14 +177,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tautStand.devices.build_device_mapping(self.view.params.tagProps[0])\n\tdevice_table_dataset \u003d autStand.devices.build_device_table(self)\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, self.view.params.tagProps[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps, \"tags\":tags_table_dataset})"
-          },
-          "scope": "G",
-          "type": "script"
-        },
-        "onMouseEnter": {
-          "config": {
-            "script": "\tfrom time import sleep\n\t\n\talarm \u003d []\n\tmessage \u003d None\n\t\n\tsleep(0.5)\n\t\n\tif system.tag.exists(\"System/aws_data\"):\n\t\tif self.view.params.tagProps[0] !\u003d \"\":\n\t\t\ttags_to_read \u003d system.tag.readBlocking(\"System/aws_data\")\n\t\t\tdecode_alarm_data \u003d system.util.jsonDecode(tags_to_read[0].value)\n\t\t\talarm \u003d [decode_alarm_data[i] for i in decode_alarm_data\n\t\t\t\t\tif decode_alarm_data[i][\u0027sourceId\u0027].startswith(self.view.params.tagProps[0])]\n\t\tif alarm:\n\t\t\talarm \u003d sorted(alarm, key \u003d lambda t:t[\u0027timestamp\u0027], reverse\u003dTrue)\n\t\t\tmessage \u003d max(alarm, key \u003d lambda p:p[\u0027priority\u0027]).get(\u0027message\u0027)\n\t\t\tif len(alarm) \u003e 1:\n\t\t\t\tmessage +\u003d \" (+\" + str(len(alarm)-1) + \")\"\n\tself.view.custom.alarm_message \u003d message"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"
diff --git a/.resources/c380b7939bc3eddfe2f23d8c8f32a7a1c05ffdeeb5d42b6efca160722e0e172a b/.resources/743ef25a79e9e4402696a4215ff91c5e96a8f23049668ab281653173621fb4f3
similarity index 81%
rename from .resources/c380b7939bc3eddfe2f23d8c8f32a7a1c05ffdeeb5d42b6efca160722e0e172a
rename to .resources/743ef25a79e9e4402696a4215ff91c5e96a8f23049668ab281653173621fb4f3
index e8bdef72..7e2d49fe 100644
--- a/.resources/c380b7939bc3eddfe2f23d8c8f32a7a1c05ffdeeb5d42b6efca160722e0e172a
+++ b/.resources/743ef25a79e9e4402696a4215ff91c5e96a8f23049668ab281653173621fb4f3
@@ -152,14 +152,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tsystem.perspective.openDock(\u0027Docked-East-Beacon\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})"
-          },
-          "scope": "G",
-          "type": "script"
-        },
-        "onMouseEnter": {
-          "config": {
-            "script": "\tfrom time import sleep\n\t\n\talarm \u003d []\n\tmessage \u003d None\n\t\n\tsleep(0.5)\n\t\n\tif system.tag.exists(\"System/aws_data\"):\n\t\tif self.view.params.tagProps[0] !\u003d \"\":\n\t\t\ttags_to_read \u003d system.tag.readBlocking(\"System/aws_data\")\n\t\t\tdecode_alarm_data \u003d system.util.jsonDecode(tags_to_read[0].value)\n\t\t\talarm \u003d [decode_alarm_data[i] for i in decode_alarm_data\n\t\t\t\t\tif decode_alarm_data[i][\u0027sourceId\u0027].startswith(self.view.params.tagProps[0])]\n\t\tif alarm:\n\t\t\talarm \u003d sorted(alarm, key \u003d lambda t:t[\u0027timestamp\u0027], reverse\u003dTrue)\n\t\t\tmessage \u003d max(alarm, key \u003d lambda p:p[\u0027priority\u0027]).get(\u0027message\u0027)\n\t\t\tif len(alarm) \u003e 1:\n\t\t\t\tmessage +\u003d \" (+\" + str(len(alarm)-1) + \")\"\n\tself.view.custom.alarm_message \u003d message"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"
diff --git a/.resources/7d7ec24b5ed5426fcc02ba74f1c382a5b90babdd6aaecfc6f82475e026f01f65 b/.resources/7d7ec24b5ed5426fcc02ba74f1c382a5b90babdd6aaecfc6f82475e026f01f65
new file mode 100644
index 00000000..8861b5bb
Binary files /dev/null and b/.resources/7d7ec24b5ed5426fcc02ba74f1c382a5b90babdd6aaecfc6f82475e026f01f65 differ
diff --git a/.resources/818715c2c7e2c688b11b4ebec9d72b602e4d38a298e72863fbc4f845c202b5d8 b/.resources/818715c2c7e2c688b11b4ebec9d72b602e4d38a298e72863fbc4f845c202b5d8
deleted file mode 100644
index 8ecfff91..00000000
Binary files a/.resources/818715c2c7e2c688b11b4ebec9d72b602e4d38a298e72863fbc4f845c202b5d8 and /dev/null differ
diff --git a/.resources/1055dd6d154cd8d9dd9bd32a3f4e838a58b1047d37624dcc1a4139092fcf5908 b/.resources/8c61ee6ac6a8d8de9adad3712f8c56de0e712a8a37a608ff4ef2c73c68676170
similarity index 95%
rename from .resources/1055dd6d154cd8d9dd9bd32a3f4e838a58b1047d37624dcc1a4139092fcf5908
rename to .resources/8c61ee6ac6a8d8de9adad3712f8c56de0e712a8a37a608ff4ef2c73c68676170
index c88c12df..705d3126 100644
--- a/.resources/1055dd6d154cd8d9dd9bd32a3f4e838a58b1047d37624dcc1a4139092fcf5908
+++ b/.resources/8c61ee6ac6a8d8de9adad3712f8c56de0e712a8a37a608ff4ef2c73c68676170
@@ -258,7 +258,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tsystem.perspective.openDock(\u0027Docked-East-PE\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"
diff --git a/.resources/e53aea586f7f607317bc9c07e33bdc38b0bdf458684786e5e3c421e91f7ff7f1 b/.resources/8d6ce71844ca5f1a8026e7865e377ce0daa0317f3f048ee0ae88c67383123b81
similarity index 95%
rename from .resources/e53aea586f7f607317bc9c07e33bdc38b0bdf458684786e5e3c421e91f7ff7f1
rename to .resources/8d6ce71844ca5f1a8026e7865e377ce0daa0317f3f048ee0ae88c67383123b81
index 9be1b897..b9ef53c9 100644
--- a/.resources/e53aea586f7f607317bc9c07e33bdc38b0bdf458684786e5e3c421e91f7ff7f1
+++ b/.resources/8d6ce71844ca5f1a8026e7865e377ce0daa0317f3f048ee0ae88c67383123b81
@@ -257,7 +257,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tsystem.perspective.openDock(\u0027Docked-East-PE\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"
diff --git a/.resources/017bae18c6246c51ce10ad2abc6ff87cb780afc3c9d00f1db17f3119340f0083 b/.resources/97632102ba9c929d031134bd4399934a170b998829c5a785d28db537cf81baf6
similarity index 77%
rename from .resources/017bae18c6246c51ce10ad2abc6ff87cb780afc3c9d00f1db17f3119340f0083
rename to .resources/97632102ba9c929d031134bd4399934a170b998829c5a785d28db537cf81baf6
index 9f491f9f..8891b2b1 100644
--- a/.resources/017bae18c6246c51ce10ad2abc6ff87cb780afc3c9d00f1db17f3119340f0083
+++ b/.resources/97632102ba9c929d031134bd4399934a170b998829c5a785d28db537cf81baf6
@@ -139,22 +139,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tsystem.perspective.openDock(\u0027Docked-East-MCM\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})"
-          },
-          "scope": "G",
-          "type": "script"
-        },
-        "onDoubleClick": {
-          "config": {
-            "script": "\ttagProps \u003d self.view.params.tagProps\n\tsystem.perspective.openPopup(\"StatusPopUP\", \"PopUp-Views/Controller-Equipment/Information\", params \u003d{\"tagProps\":tagProps})\n\t"
-          },
-          "enabled": false,
-          "scope": "G",
-          "type": "script"
-        },
-        "onMouseEnter": {
-          "config": {
-            "script": "\tfrom time import sleep\n\t\n\talarm \u003d []\n\tmessage \u003d None\n\t\n\tsleep(0.5)\n\t\n\tif system.tag.exists(\"System/aws_data\"):\n\t\tif self.view.params.tagProps[0] !\u003d \"\":\n\t\t\ttags_to_read \u003d system.tag.readBlocking(\"System/aws_data\")\n\t\t\tdecode_alarm_data \u003d system.util.jsonDecode(tags_to_read[0].value)\n\t\t\talarm \u003d [decode_alarm_data[i] for i in decode_alarm_data\n\t\t\t\t\tif decode_alarm_data[i][\u0027sourceId\u0027].startswith(self.view.params.tagProps[0])]\n\t\tif alarm:\n\t\t\talarm \u003d sorted(alarm, key \u003d lambda t:t[\u0027timestamp\u0027], reverse\u003dTrue)\n\t\t\tmessage \u003d max(alarm, key \u003d lambda p:p[\u0027priority\u0027]).get(\u0027message\u0027)\n\t\t\tif len(alarm) \u003e 1:\n\t\t\t\tmessage +\u003d \" (+\" + str(len(alarm)-1) + \")\"\n\tself.view.custom.alarm_message \u003d message"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"
diff --git a/.resources/b9a10746a763c9d2ab492e31fa25325910f585d045adfef1980b406900de93e9 b/.resources/b9a10746a763c9d2ab492e31fa25325910f585d045adfef1980b406900de93e9
deleted file mode 100644
index 9774d85e..00000000
Binary files a/.resources/b9a10746a763c9d2ab492e31fa25325910f585d045adfef1980b406900de93e9 and /dev/null differ
diff --git a/.resources/ebbb6fdcb3d3e441bc9d315e4b940b8008fca71c06d8cde33267a7756d929ad5 b/.resources/bfbe67e5c1f7ac1bf57643277ba31039fd465e5de8c2da6720a16be790c6be02
similarity index 93%
rename from .resources/ebbb6fdcb3d3e441bc9d315e4b940b8008fca71c06d8cde33267a7756d929ad5
rename to .resources/bfbe67e5c1f7ac1bf57643277ba31039fd465e5de8c2da6720a16be790c6be02
index 3afb82e0..5d947427 100644
--- a/.resources/ebbb6fdcb3d3e441bc9d315e4b940b8008fca71c06d8cde33267a7756d929ad5
+++ b/.resources/bfbe67e5c1f7ac1bf57643277ba31039fd465e5de8c2da6720a16be790c6be02
@@ -130,7 +130,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"
diff --git a/.resources/a7e8d34377d5ea1fb38f375d25a492748de3f057625028de884b47dc0ad28159 b/.resources/d10e3144c43804dd8f83b6b9cf03306c075e43333f91309a88a34cf67f599d57
similarity index 93%
rename from .resources/a7e8d34377d5ea1fb38f375d25a492748de3f057625028de884b47dc0ad28159
rename to .resources/d10e3144c43804dd8f83b6b9cf03306c075e43333f91309a88a34cf67f599d57
index 3602994a..6d4039a4 100644
--- a/.resources/a7e8d34377d5ea1fb38f375d25a492748de3f057625028de884b47dc0ad28159
+++ b/.resources/d10e3144c43804dd8f83b6b9cf03306c075e43333f91309a88a34cf67f599d57
@@ -126,7 +126,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"
diff --git a/.resources/e36354bb2858b2cbd33ce439738338bae650bde10f935ca6866a181dee9bd713 b/.resources/e36354bb2858b2cbd33ce439738338bae650bde10f935ca6866a181dee9bd713
new file mode 100644
index 00000000..396e4f7f
Binary files /dev/null and b/.resources/e36354bb2858b2cbd33ce439738338bae650bde10f935ca6866a181dee9bd713 differ
diff --git a/.resources/72d61b6c56bdfcc87f871003a63ecd8e8f6e299403d9584e23cd0ed9906b1974 b/.resources/e631e31b42954fea9ffcb7598438e5ed0d1dca6f4270ac0261dd82b539ef4ffd
similarity index 78%
rename from .resources/72d61b6c56bdfcc87f871003a63ecd8e8f6e299403d9584e23cd0ed9906b1974
rename to .resources/e631e31b42954fea9ffcb7598438e5ed0d1dca6f4270ac0261dd82b539ef4ffd
index 9e2aeeaf..99ce1c55 100644
--- a/.resources/72d61b6c56bdfcc87f871003a63ecd8e8f6e299403d9584e23cd0ed9906b1974
+++ b/.resources/e631e31b42954fea9ffcb7598438e5ed0d1dca6f4270ac0261dd82b539ef4ffd
@@ -132,14 +132,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})"
-          },
-          "scope": "G",
-          "type": "script"
-        },
-        "onMouseEnter": {
-          "config": {
-            "script": "\tfrom time import sleep\n\t\n\talarm \u003d []\n\tmessage \u003d None\n\t\n\tsleep(0.5)\n\t\n\tif system.tag.exists(\"System/aws_data\"):\n\t\tif self.view.params.tagProps[0] !\u003d \"\":\n\t\t\ttags_to_read \u003d system.tag.readBlocking(\"System/aws_data\")\n\t\t\tdecode_alarm_data \u003d system.util.jsonDecode(tags_to_read[0].value)\n\t\t\talarm \u003d [decode_alarm_data[i] for i in decode_alarm_data\n\t\t\t\t\tif decode_alarm_data[i][\u0027sourceId\u0027].startswith(self.view.params.tagProps[0])]\n\t\tif alarm:\n\t\t\talarm \u003d sorted(alarm, key \u003d lambda t:t[\u0027timestamp\u0027], reverse\u003dTrue)\n\t\t\tmessage \u003d max(alarm, key \u003d lambda p:p[\u0027priority\u0027]).get(\u0027message\u0027)\n\t\t\tif len(alarm) \u003e 1:\n\t\t\t\tmessage +\u003d \" (+\" + str(len(alarm)-1) + \")\"\n\tself.view.custom.alarm_message \u003d message"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"
diff --git a/.resources/a33d514fceb9b73f2c4860d7e09806c4907375684da1e1ddb583b61eaee1e0e3 b/.resources/eb7fc3f51d0c4091b13fa6c04d5ae400b40fe049deef4a60a19451374093d763
similarity index 88%
rename from .resources/a33d514fceb9b73f2c4860d7e09806c4907375684da1e1ddb583b61eaee1e0e3
rename to .resources/eb7fc3f51d0c4091b13fa6c04d5ae400b40fe049deef4a60a19451374093d763
index 44dde28f..c738f88f 100644
--- a/.resources/a33d514fceb9b73f2c4860d7e09806c4907375684da1e1ddb583b61eaee1e0e3
+++ b/.resources/eb7fc3f51d0c4091b13fa6c04d5ae400b40fe049deef4a60a19451374093d763
@@ -340,21 +340,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tsystem.perspective.openDock(\u0027Docked-East-SS\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})"
-          },
-          "scope": "G",
-          "type": "script"
-        },
-        "onDoubleClick": {
-          "config": {
-            "script": "\ttagProps \u003d self.view.params.tagProps\n\tsystem.perspective.openPopup(\"StatusPopUP\", \"PopUp-Views/Controller-Equipment/Information\", params \u003d{\"tagProps\":tagProps})"
-          },
-          "scope": "G",
-          "type": "script"
-        },
-        "onMouseEnter": {
-          "config": {
-            "script": "\tfrom time import sleep\n\t\n\talarm \u003d []\n\tmessage \u003d None\n\t\n\tsleep(0.5)\n\t\n\tif system.tag.exists(\"System/aws_data\"):\n\t\tif self.view.params.tagProps[0] !\u003d \"\":\n\t\t\ttags_to_read \u003d system.tag.readBlocking(\"System/aws_data\")\n\t\t\tdecode_alarm_data \u003d system.util.jsonDecode(tags_to_read[0].value)\n\t\t\talarm \u003d [decode_alarm_data[i] for i in decode_alarm_data\n\t\t\t\t\tif decode_alarm_data[i][\u0027sourceId\u0027].startswith(self.view.params.tagProps[0])]\n\t\tif alarm:\n\t\t\talarm \u003d sorted(alarm, key \u003d lambda t:t[\u0027timestamp\u0027], reverse\u003dTrue)\n\t\t\tmessage \u003d max(alarm, key \u003d lambda p:p[\u0027priority\u0027]).get(\u0027message\u0027)\n\t\t\tif len(alarm) \u003e 1:\n\t\t\t\tmessage +\u003d \" (+\" + str(len(alarm)-1) + \")\"\n\tself.view.custom.alarm_message \u003d message"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"
diff --git a/.resources/03d61ca3b091c01bb4b1fc019e5c171b96ffe0cff5910e0f8c1595961347061e b/.resources/eec244e20e1bb764ca0a7cbf2d73fb3f070336639d49d327a3d23c4885d3fffc
similarity index 94%
rename from .resources/03d61ca3b091c01bb4b1fc019e5c171b96ffe0cff5910e0f8c1595961347061e
rename to .resources/eec244e20e1bb764ca0a7cbf2d73fb3f070336639d49d327a3d23c4885d3fffc
index 030c605b..06be688b 100644
--- a/.resources/03d61ca3b091c01bb4b1fc019e5c171b96ffe0cff5910e0f8c1595961347061e
+++ b/.resources/eec244e20e1bb764ca0a7cbf2d73fb3f070336639d49d327a3d23c4885d3fffc
@@ -217,7 +217,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/resource.json
index 30517cf3..25fcf4ac 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/resource.json	
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/resource.json	
@@ -10,8 +10,8 @@
   "attributes": {
     "lastModification": {
       "actor": "admin",
-      "timestamp": "2025-09-11T15:34:25Z"
+      "timestamp": "2025-09-12T08:15:14Z"
     },
-    "lastModificationSignature": "fa75d2234d657ae4126d00111115632c0f43d0ae0975c05078fb07db169423fb"
+    "lastModificationSignature": "7632ba4ae03b2d4d46d96895311f508df47276f743397fc6dae8852cace28b9c"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/thumbnail.png
index 4a7b2064..a4b27bdb 100644
Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/thumbnail.png differ
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/view.json
index 1725948b..afa5bb98 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/view.json	
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/view.json	
@@ -2898,7 +2898,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -6959,7 +6959,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -6988,7 +6988,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7017,7 +7017,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7046,7 +7046,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7075,7 +7075,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7104,7 +7104,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7133,7 +7133,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7162,7 +7162,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7191,7 +7191,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7220,7 +7220,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7249,7 +7249,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7278,7 +7278,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7307,7 +7307,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7336,7 +7336,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7365,7 +7365,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7394,7 +7394,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7423,7 +7423,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7452,7 +7452,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7481,7 +7481,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7510,7 +7510,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7713,7 +7713,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7742,7 +7742,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7771,7 +7771,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7800,7 +7800,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7829,7 +7829,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7858,7 +7858,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7887,7 +7887,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7916,7 +7916,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7945,7 +7945,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -7974,7 +7974,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -8003,7 +8003,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -8032,7 +8032,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -8061,7 +8061,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -8090,7 +8090,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -8119,7 +8119,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -8148,7 +8148,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -8177,7 +8177,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -8206,7 +8206,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -8235,7 +8235,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -8264,7 +8264,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
@@ -8293,7 +8293,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/ProxSwitch"
+              "path": "autStand/Equipment/ProxSensor"
             },
             "type": "ia.display.view"
           },
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Beacon/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Beacon/resource.json
index f7213084..3016795e 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Beacon/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Beacon/resource.json
@@ -9,8 +9,8 @@
   "attributes": {
     "lastModification": {
       "actor": "admin",
-      "timestamp": "2025-09-03T15:51:44Z"
+      "timestamp": "2025-09-12T08:09:26Z"
     },
-    "lastModificationSignature": "f3e21bff90d6d480a55f2f9bb29c9bd4f7fdc7bf86d1f18943b0dae6ba5d83f6"
+    "lastModificationSignature": "b7b96cbadf39438f69a9a3bfcc4fdae77f7bf1928de4c1932eed8ddf26955251"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Beacon/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Beacon/view.json
index e8bdef72..7e2d49fe 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Beacon/view.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Beacon/view.json
@@ -152,14 +152,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tsystem.perspective.openDock(\u0027Docked-East-Beacon\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})"
-          },
-          "scope": "G",
-          "type": "script"
-        },
-        "onMouseEnter": {
-          "config": {
-            "script": "\tfrom time import sleep\n\t\n\talarm \u003d []\n\tmessage \u003d None\n\t\n\tsleep(0.5)\n\t\n\tif system.tag.exists(\"System/aws_data\"):\n\t\tif self.view.params.tagProps[0] !\u003d \"\":\n\t\t\ttags_to_read \u003d system.tag.readBlocking(\"System/aws_data\")\n\t\t\tdecode_alarm_data \u003d system.util.jsonDecode(tags_to_read[0].value)\n\t\t\talarm \u003d [decode_alarm_data[i] for i in decode_alarm_data\n\t\t\t\t\tif decode_alarm_data[i][\u0027sourceId\u0027].startswith(self.view.params.tagProps[0])]\n\t\tif alarm:\n\t\t\talarm \u003d sorted(alarm, key \u003d lambda t:t[\u0027timestamp\u0027], reverse\u003dTrue)\n\t\t\tmessage \u003d max(alarm, key \u003d lambda p:p[\u0027priority\u0027]).get(\u0027message\u0027)\n\t\t\tif len(alarm) \u003e 1:\n\t\t\t\tmessage +\u003d \" (+\" + str(len(alarm)-1) + \")\"\n\tself.view.custom.alarm_message \u003d message"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Button/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Button/resource.json
index 2c6ff4a0..692c0c93 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Button/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Button/resource.json
@@ -10,8 +10,8 @@
   "attributes": {
     "lastModification": {
       "actor": "admin",
-      "timestamp": "2025-09-11T15:31:23Z"
+      "timestamp": "2025-09-12T08:09:17Z"
     },
-    "lastModificationSignature": "3b6ec724310321bc4aafa38262020118c4b3c64e4497045fa1040c43af6ff0f3"
+    "lastModificationSignature": "802b040f349dcacf053bc9c474a73ff0999b18a2a9c38ea356a975bbd0848a76"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Button/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Button/view.json
index cb104411..59c26bef 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Button/view.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Button/view.json
@@ -177,14 +177,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tautStand.devices.build_device_mapping(self.view.params.tagProps[0])\n\tdevice_table_dataset \u003d autStand.devices.build_device_table(self)\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, self.view.params.tagProps[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps, \"tags\":tags_table_dataset})"
-          },
-          "scope": "G",
-          "type": "script"
-        },
-        "onMouseEnter": {
-          "config": {
-            "script": "\tfrom time import sleep\n\t\n\talarm \u003d []\n\tmessage \u003d None\n\t\n\tsleep(0.5)\n\t\n\tif system.tag.exists(\"System/aws_data\"):\n\t\tif self.view.params.tagProps[0] !\u003d \"\":\n\t\t\ttags_to_read \u003d system.tag.readBlocking(\"System/aws_data\")\n\t\t\tdecode_alarm_data \u003d system.util.jsonDecode(tags_to_read[0].value)\n\t\t\talarm \u003d [decode_alarm_data[i] for i in decode_alarm_data\n\t\t\t\t\tif decode_alarm_data[i][\u0027sourceId\u0027].startswith(self.view.params.tagProps[0])]\n\t\tif alarm:\n\t\t\talarm \u003d sorted(alarm, key \u003d lambda t:t[\u0027timestamp\u0027], reverse\u003dTrue)\n\t\t\tmessage \u003d max(alarm, key \u003d lambda p:p[\u0027priority\u0027]).get(\u0027message\u0027)\n\t\t\tif len(alarm) \u003e 1:\n\t\t\t\tmessage +\u003d \" (+\" + str(len(alarm)-1) + \")\"\n\tself.view.custom.alarm_message \u003d message"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Camera/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Camera/resource.json
index 07f03f50..201c88c5 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Camera/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Camera/resource.json
@@ -9,9 +9,9 @@
   ],
   "attributes": {
     "lastModification": {
-      "actor": "external",
-      "timestamp": "2025-08-28T09:46:53Z"
+      "actor": "admin",
+      "timestamp": "2025-09-12T08:13:46Z"
     },
-    "lastModificationSignature": "7c29b75a0e872490718c67126439a810baeb9b0e3a9407632b17a6778620a824"
+    "lastModificationSignature": "94726aa843206ff43d29a060ac25426284cf360af20660e828a558c8578f93fd"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Camera/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Camera/view.json
index 1c5075a1..d6c933bb 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Camera/view.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Camera/view.json
@@ -1,14 +1,7 @@
 {
   "custom": {
-    "covert_mode": null,
     "disconnected": false,
-    "display_icon": null,
-    "error": false,
-    "isMatch": 0,
     "priority": 0,
-    "priority_string": "No active alarms",
-    "running_status": 0,
-    "searchId": null,
     "state": 5,
     "state_string": "Unknown"
   },
@@ -27,21 +20,6 @@
     ]
   },
   "propConfig": {
-    "custom.covert_mode": {
-      "binding": {
-        "config": {
-          "path": "view.custom.state"
-        },
-        "transforms": [
-          {
-            "expression": "case(\t{value},\r\n\t\t0, {session.custom.alarm_filter.show_running},\r\n\t\t1, True,\r\n\t\t2, True,\r\n\t\t3, {session.custom.alarm_filter.show_low_alarm},\r\n\t\t4, {session.custom.alarm_filter.show_diagnostic},\r\n\t\t5, {session.custom.alarm_filter.show_running},\r\n\t\tFalse)",
-            "type": "expression"
-          }
-        ],
-        "type": "property"
-      },
-      "persistent": true
-    },
     "custom.disconnected": {
       "binding": {
         "config": {
@@ -63,39 +41,6 @@
       },
       "persistent": true
     },
-    "custom.display_icon": {
-      "binding": {
-        "config": {
-          "expression": "{this.custom.covert_mode}//||{this.custom.isMatch}\u003e0"
-        },
-        "type": "expr"
-      },
-      "persistent": true
-    },
-    "custom.error": {
-      "binding": {
-        "config": {
-          "path": "view.custom.state"
-        },
-        "transforms": [
-          {
-            "expression": "0 \u003c {value} \u0026\u0026 {value} \u003c 5",
-            "type": "expression"
-          }
-        ],
-        "type": "property"
-      },
-      "persistent": true
-    },
-    "custom.isMatch": {
-      "binding": {
-        "config": {
-          "expression": "if({view.params.tagProps[0]}\u003d\"value\",0,\nif({this.custom.searchId}\u003d{view.params.tagProps[0]},100,0))"
-        },
-        "type": "expr"
-      },
-      "persistent": true
-    },
     "custom.priority": {
       "binding": {
         "config": {
@@ -131,16 +76,7 @@
       },
       "persistent": true
     },
-    "custom.priority_string": {
-      "binding": {
-        "config": {
-          "expression": "case({view.custom.state},\r\n1, \"High\",\r\n2, \"Medium\",\r\n3, \"Low\",\r\n4, \"Diagnostic\",\r\n5, \"No active alarms\",\r\n\"Unknown\")"
-        },
-        "type": "expr"
-      },
-      "persistent": true
-    },
-    "custom.running_status": {
+    "custom.state": {
       "binding": {
         "config": {
           "fallbackDelay": 2.5,
@@ -153,7 +89,7 @@
         },
         "transforms": [
           {
-            "expression": "coalesce({value},{view.params.forceRunningStatus},0)",
+            "expression": "coalesce({value},0)",
             "type": "expression"
           }
         ],
@@ -161,68 +97,10 @@
       },
       "persistent": true
     },
-    "custom.searchId": {
-      "binding": {
-        "config": {
-          "path": "session.custom.searchId"
-        },
-        "type": "property"
-      },
-      "persistent": true
-    },
-    "custom.state": {
-      "binding": {
-        "config": {
-          "fallbackDelay": 2.5,
-          "mode": "indirect",
-          "references": {
-            "0": "{view.params.tagProps[0]}",
-            "fc": "{session.custom.fc}"
-          },
-          "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/ALARMST"
-        },
-        "transforms": [
-          {
-            "expression": "coalesce({value},{view.params.forceFaultStatus},0)",
-            "type": "expression"
-          },
-          {
-            "fallback": null,
-            "inputType": "scalar",
-            "mappings": [
-              {
-                "input": 4,
-                "output": 1
-              },
-              {
-                "input": 3,
-                "output": 2
-              },
-              {
-                "input": 2,
-                "output": 3
-              },
-              {
-                "input": 1,
-                "output": 4
-              },
-              {
-                "input": 0,
-                "output": 5
-              }
-            ],
-            "outputType": "scalar",
-            "type": "map"
-          }
-        ],
-        "type": "tag"
-      },
-      "persistent": true
-    },
     "custom.state_string": {
       "binding": {
         "config": {
-          "expression": "case({view.custom.running_status},\r\n1, \"Faulted\",\r\n2, \"Stopped\",\r\n3, \"Running\",\r\n\"Unknown\")"
+          "expression": "case({view.custom.state},\r\n1, \"Faulted\",\r\n2, \"Stopped\",\r\n3, \"Running\",\r\n\"Unknown\")"
         },
         "type": "expr"
       },
@@ -268,68 +146,6 @@
               ],
               "type": "property"
             }
-          },
-          "props.style.classes": {
-            "binding": {
-              "config": {
-                "expression": "if({session.custom.colours.colour_impaired} \u003d True \u0026\u0026 {view.custom.isMatch} \u003e 0,\r\n{view.custom.state} + 100 + {view.custom.isMatch},\r\n{view.custom.state} + {view.custom.isMatch})"
-              },
-              "transforms": [
-                {
-                  "fallback": "",
-                  "inputType": "scalar",
-                  "mappings": [
-                    {
-                      "input": 101,
-                      "output": "State-Styles/State101"
-                    },
-                    {
-                      "input": 102,
-                      "output": "State-Styles/State102"
-                    },
-                    {
-                      "input": 103,
-                      "output": "State-Styles/State103"
-                    },
-                    {
-                      "input": 104,
-                      "output": "State-Styles/State104"
-                    },
-                    {
-                      "input": 105,
-                      "output": "State-Styles/State105"
-                    },
-                    {
-                      "input": 106,
-                      "output": "State-Styles/State106"
-                    },
-                    {
-                      "input": 201,
-                      "output": "State-Styles/State201"
-                    },
-                    {
-                      "input": 202,
-                      "output": "State-Styles/State202"
-                    },
-                    {
-                      "input": 203,
-                      "output": "State-Styles/State203"
-                    },
-                    {
-                      "input": 204,
-                      "output": "State-Styles/State204"
-                    },
-                    {
-                      "input": 205,
-                      "output": "State-Styles/State205"
-                    }
-                  ],
-                  "outputType": "style-list",
-                  "type": "map"
-                }
-              ],
-              "type": "expr"
-            }
           }
         },
         "props": {
@@ -399,7 +215,6 @@
           "fill": {
             "paint": "#000000"
           },
-          "style": {},
           "viewBox": "0 0 29.22 29.22"
         },
         "type": "ia.shapes.svg"
@@ -409,22 +224,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tsystem.perspective.openDock(\u0027Docked-East\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})"
-          },
-          "scope": "G",
-          "type": "script"
-        },
-        "onDoubleClick": {
-          "config": {
-            "script": "\ttagProps \u003d self.view.params.tagProps\n\tsystem.perspective.openPopup(\"StatusPopUP\", \"PopUp-Views/Controller-Equipment/Information\", params \u003d{\"tagProps\":tagProps})\n\t"
-          },
-          "enabled": false,
-          "scope": "G",
-          "type": "script"
-        },
-        "onMouseEnter": {
-          "config": {
-            "script": "\tfrom time import sleep\n\t\n\talarm \u003d []\n\tmessage \u003d None\n\t\n\tsleep(0.5)\n\t\n\tif system.tag.exists(\"System/aws_data\"):\n\t\tif self.view.params.tagProps[0] !\u003d \"\":\n\t\t\ttags_to_read \u003d system.tag.readBlocking(\"System/aws_data\")\n\t\t\tdecode_alarm_data \u003d system.util.jsonDecode(tags_to_read[0].value)\n\t\t\talarm \u003d [decode_alarm_data[i] for i in decode_alarm_data\n\t\t\t\t\tif decode_alarm_data[i][\u0027sourceId\u0027].startswith(self.view.params.tagProps[0])]\n\t\tif alarm:\n\t\t\talarm \u003d sorted(alarm, key \u003d lambda t:t[\u0027timestamp\u0027], reverse\u003dTrue)\n\t\t\tmessage \u003d max(alarm, key \u003d lambda p:p[\u0027priority\u0027]).get(\u0027message\u0027)\n\t\t\tif len(alarm) \u003e 1:\n\t\t\t\tmessage +\u003d \" (+\" + str(len(alarm)-1) + \")\"\n\tself.view.custom.alarm_message \u003d message"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"
@@ -505,7 +305,7 @@
       "meta.tooltip.text": {
         "binding": {
           "config": {
-            "expression": "if({view.custom.disconnected} \u003d False,\n\tif(isNull({view.custom.alarm_message}),\n\t\"Source Id: \" + {view.params.tagProps[0]} +\n\t\", Priority: \" + {view.custom.priority_string} +\n\t\", State: \" + {view.custom.state_string},\n\t\"Source Id: \" + {view.params.tagProps[0]} +\n\t\", Alarm: \" + {view.custom.alarm_message} +\n\t\", Priority: \" + {view.custom.priority_string} +\n\t\", State: \" + {view.custom.state_string}),\n\"Source Id: \" +{view.params.tagProps[0]} + \", Priority: Unknown, State: Unknown\")"
+            "expression": "if({view.custom.disconnected} \u003d False,\n\tif(isNull({view.custom.alarm_message}),\n\t\"Source Id: \" + {view.params.tagProps[0]} +\n\t\", State: \" + {view.custom.state_string},\n\t\"Source Id: \" + {view.params.tagProps[0]} +\n\t\", Priority: \" + {view.custom.priority_string} +\n\t\", State: \" + {view.custom.state_string}),\n\"Source Id: \" +{view.params.tagProps[0]} + \", Priority: Unknown, State: Unknown\")"
           },
           "type": "expr"
         }
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Encoder/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Encoder/resource.json
index 44a1bd16..71a4c526 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Encoder/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Encoder/resource.json
@@ -9,8 +9,8 @@
   "attributes": {
     "lastModification": {
       "actor": "admin",
-      "timestamp": "2025-09-02T13:25:19Z"
+      "timestamp": "2025-09-12T08:07:01Z"
     },
-    "lastModificationSignature": "bba03f4243f24906c47664f059bab3a0f432b20c8d4e84fba20d654472e3c8c4"
+    "lastModificationSignature": "72d79f0d785d4385de0d8571aebc310f5558e6c4c57ddfc0a59066dcf8d86e62"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Encoder/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Encoder/view.json
index 030c605b..06be688b 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Encoder/view.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Encoder/view.json
@@ -217,7 +217,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Field_IO/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Field_IO/resource.json
index 77781c01..62065e7b 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Field_IO/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Field_IO/resource.json
@@ -9,8 +9,8 @@
   "attributes": {
     "lastModification": {
       "actor": "admin",
-      "timestamp": "2025-09-12T07:54:01Z"
+      "timestamp": "2025-09-12T08:07:09Z"
     },
-    "lastModificationSignature": "f78015de0c193b861735f5e23766696a2377171ca5b80cfe9b0d515cfbe9d202"
+    "lastModificationSignature": "70ccbd002f73569fb224b5931615edaaf4d3871be56a8747de6033d36de4bc1e"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Field_IO/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Field_IO/view.json
index 3602994a..6d4039a4 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Field_IO/view.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Field_IO/view.json
@@ -126,7 +126,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/resource.json
index 3d65e13a..c80714ef 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/resource.json
@@ -10,8 +10,8 @@
   "attributes": {
     "lastModification": {
       "actor": "admin",
-      "timestamp": "2025-09-09T14:13:52Z"
+      "timestamp": "2025-09-12T08:07:40Z"
     },
-    "lastModificationSignature": "f6b582bfffa215b6fb202c4d0fb729225a58e5b6b3fd298fd6d77e080dde37f8"
+    "lastModificationSignature": "7d38b7c8acbbaff7cca5847777fefbf01315969adeeffdb37c221a94565f96c9"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/thumbnail.png
index 9774d85e..396e4f7f 100644
Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/thumbnail.png differ
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/view.json
index 9f491f9f..8891b2b1 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/view.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/MCM/view.json
@@ -139,22 +139,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tsystem.perspective.openDock(\u0027Docked-East-MCM\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})"
-          },
-          "scope": "G",
-          "type": "script"
-        },
-        "onDoubleClick": {
-          "config": {
-            "script": "\ttagProps \u003d self.view.params.tagProps\n\tsystem.perspective.openPopup(\"StatusPopUP\", \"PopUp-Views/Controller-Equipment/Information\", params \u003d{\"tagProps\":tagProps})\n\t"
-          },
-          "enabled": false,
-          "scope": "G",
-          "type": "script"
-        },
-        "onMouseEnter": {
-          "config": {
-            "script": "\tfrom time import sleep\n\t\n\talarm \u003d []\n\tmessage \u003d None\n\t\n\tsleep(0.5)\n\t\n\tif system.tag.exists(\"System/aws_data\"):\n\t\tif self.view.params.tagProps[0] !\u003d \"\":\n\t\t\ttags_to_read \u003d system.tag.readBlocking(\"System/aws_data\")\n\t\t\tdecode_alarm_data \u003d system.util.jsonDecode(tags_to_read[0].value)\n\t\t\talarm \u003d [decode_alarm_data[i] for i in decode_alarm_data\n\t\t\t\t\tif decode_alarm_data[i][\u0027sourceId\u0027].startswith(self.view.params.tagProps[0])]\n\t\tif alarm:\n\t\t\talarm \u003d sorted(alarm, key \u003d lambda t:t[\u0027timestamp\u0027], reverse\u003dTrue)\n\t\t\tmessage \u003d max(alarm, key \u003d lambda p:p[\u0027priority\u0027]).get(\u0027message\u0027)\n\t\t\tif len(alarm) \u003e 1:\n\t\t\t\tmessage +\u003d \" (+\" + str(len(alarm)-1) + \")\"\n\tself.view.custom.alarm_message \u003d message"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Chute/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Chute/resource.json
index f8257277..c6d7254a 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Chute/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Chute/resource.json
@@ -10,8 +10,8 @@
   "attributes": {
     "lastModification": {
       "actor": "admin",
-      "timestamp": "2025-09-09T14:19:06Z"
+      "timestamp": "2025-09-12T08:07:49Z"
     },
-    "lastModificationSignature": "fdf41a5e2c9f4a5fe539faa7f5cdc7a6f51e511f28f9b34ac7aa8e407881746a"
+    "lastModificationSignature": "9032f81c9b945dcdfeb9e7306ad3fc105adc69aebb98a8d2c9218554f7d25a20"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Chute/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Chute/view.json
index c88c12df..705d3126 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Chute/view.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Chute/view.json
@@ -258,7 +258,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tsystem.perspective.openDock(\u0027Docked-East-PE\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Long/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Long/resource.json
index 9789442c..a30b4ad2 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Long/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Long/resource.json
@@ -10,8 +10,8 @@
   "attributes": {
     "lastModification": {
       "actor": "admin",
-      "timestamp": "2025-09-03T15:47:15Z"
+      "timestamp": "2025-09-12T08:07:58Z"
     },
-    "lastModificationSignature": "a79732e0940941214a569258d6c45cea3316dd589eaf8b915d0a5e3864fad3ed"
+    "lastModificationSignature": "f5b0d20fa046d450033e60b6adf72b0a00d780d752b9988150749f775dc6f69b"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Long/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Long/view.json
index 9be1b897..b9ef53c9 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Long/view.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Long/view.json
@@ -257,7 +257,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tsystem.perspective.openDock(\u0027Docked-East-PE\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Tracking/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Tracking/resource.json
index d8ff0393..34c304cf 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Tracking/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Tracking/resource.json
@@ -10,8 +10,8 @@
   "attributes": {
     "lastModification": {
       "actor": "admin",
-      "timestamp": "2025-09-09T14:17:16Z"
+      "timestamp": "2025-09-12T08:08:06Z"
     },
-    "lastModificationSignature": "e2f87be280e3c6ec9d7e2a38399b190a8a6a2d564843253a85b2eb1f49944fce"
+    "lastModificationSignature": "b5913666736c99c56ddc618543a1e88296a2a3449d1d1078e88f94d0d7ba5769"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Tracking/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Tracking/view.json
index 881b1bad..6f60d0be 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Tracking/view.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Photoeye_Tracking/view.json
@@ -221,7 +221,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tsystem.perspective.openDock(\u0027Docked-East-PE\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSwitch/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSensor/resource.json
similarity index 57%
rename from BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSwitch/resource.json
rename to BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSensor/resource.json
index 90a5449e..110037ad 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSwitch/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSensor/resource.json
@@ -9,8 +9,8 @@
   "attributes": {
     "lastModification": {
       "actor": "admin",
-      "timestamp": "2025-09-03T15:50:57Z"
+      "timestamp": "2025-09-12T08:09:59Z"
     },
-    "lastModificationSignature": "61a843f550f0bd57f24651afc9511ab4731c0aac9022392bdb2240a81f55ae20"
+    "lastModificationSignature": "2897dc2bf3ccfb312622119ddd5963cf65e7fd93b142ed405d3880e5153e2c67"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSwitch/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSensor/view.json
similarity index 100%
rename from BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSwitch/view.json
rename to BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSensor/view.json
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/SS_Button/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/SS_Button/resource.json
index d24bf7f1..8072f304 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/SS_Button/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/SS_Button/resource.json
@@ -10,8 +10,8 @@
   "attributes": {
     "lastModification": {
       "actor": "admin",
-      "timestamp": "2025-09-02T14:08:25Z"
+      "timestamp": "2025-09-12T08:08:33Z"
     },
-    "lastModificationSignature": "c8d76f0c22ace2d21f057a581d9d63526dccb7eca53179cc184f510e02c28aa6"
+    "lastModificationSignature": "bd4f8a60105ce0a37bdd5ea6472d3085df779d22dfe1ce9f1f825d24437a6e01"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/SS_Button/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/SS_Button/thumbnail.png
index 8ecfff91..8861b5bb 100644
Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/SS_Button/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/SS_Button/thumbnail.png differ
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/SS_Button/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/SS_Button/view.json
index 44dde28f..c738f88f 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/SS_Button/view.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/SS_Button/view.json
@@ -340,21 +340,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tsystem.perspective.openDock(\u0027Docked-East-SS\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})"
-          },
-          "scope": "G",
-          "type": "script"
-        },
-        "onDoubleClick": {
-          "config": {
-            "script": "\ttagProps \u003d self.view.params.tagProps\n\tsystem.perspective.openPopup(\"StatusPopUP\", \"PopUp-Views/Controller-Equipment/Information\", params \u003d{\"tagProps\":tagProps})"
-          },
-          "scope": "G",
-          "type": "script"
-        },
-        "onMouseEnter": {
-          "config": {
-            "script": "\tfrom time import sleep\n\t\n\talarm \u003d []\n\tmessage \u003d None\n\t\n\tsleep(0.5)\n\t\n\tif system.tag.exists(\"System/aws_data\"):\n\t\tif self.view.params.tagProps[0] !\u003d \"\":\n\t\t\ttags_to_read \u003d system.tag.readBlocking(\"System/aws_data\")\n\t\t\tdecode_alarm_data \u003d system.util.jsonDecode(tags_to_read[0].value)\n\t\t\talarm \u003d [decode_alarm_data[i] for i in decode_alarm_data\n\t\t\t\t\tif decode_alarm_data[i][\u0027sourceId\u0027].startswith(self.view.params.tagProps[0])]\n\t\tif alarm:\n\t\t\talarm \u003d sorted(alarm, key \u003d lambda t:t[\u0027timestamp\u0027], reverse\u003dTrue)\n\t\t\tmessage \u003d max(alarm, key \u003d lambda p:p[\u0027priority\u0027]).get(\u0027message\u0027)\n\t\t\tif len(alarm) \u003e 1:\n\t\t\t\tmessage +\u003d \" (+\" + str(len(alarm)-1) + \")\"\n\tself.view.custom.alarm_message \u003d message"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Safety_IO/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Safety_IO/resource.json
index e26b76f5..bd97c9e4 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Safety_IO/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Safety_IO/resource.json
@@ -9,8 +9,8 @@
   "attributes": {
     "lastModification": {
       "actor": "admin",
-      "timestamp": "2025-09-03T15:49:42Z"
+      "timestamp": "2025-09-12T08:08:45Z"
     },
-    "lastModificationSignature": "69658ed9aaa4e1cf9f5e13de8c4906aba778dabab3d345f163098b9897669305"
+    "lastModificationSignature": "acb6ad99720c692ae9a5c54cce56c15a9070656dbff87f70a9f06896e3dbdd87"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Safety_IO/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Safety_IO/view.json
index 9e2aeeaf..99ce1c55 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Safety_IO/view.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Safety_IO/view.json
@@ -132,14 +132,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})"
-          },
-          "scope": "G",
-          "type": "script"
-        },
-        "onMouseEnter": {
-          "config": {
-            "script": "\tfrom time import sleep\n\t\n\talarm \u003d []\n\tmessage \u003d None\n\t\n\tsleep(0.5)\n\t\n\tif system.tag.exists(\"System/aws_data\"):\n\t\tif self.view.params.tagProps[0] !\u003d \"\":\n\t\t\ttags_to_read \u003d system.tag.readBlocking(\"System/aws_data\")\n\t\t\tdecode_alarm_data \u003d system.util.jsonDecode(tags_to_read[0].value)\n\t\t\talarm \u003d [decode_alarm_data[i] for i in decode_alarm_data\n\t\t\t\t\tif decode_alarm_data[i][\u0027sourceId\u0027].startswith(self.view.params.tagProps[0])]\n\t\tif alarm:\n\t\t\talarm \u003d sorted(alarm, key \u003d lambda t:t[\u0027timestamp\u0027], reverse\u003dTrue)\n\t\t\tmessage \u003d max(alarm, key \u003d lambda p:p[\u0027priority\u0027]).get(\u0027message\u0027)\n\t\t\tif len(alarm) \u003e 1:\n\t\t\t\tmessage +\u003d \" (+\" + str(len(alarm)-1) + \")\"\n\tself.view.custom.alarm_message \u003d message"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Solenoid/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Solenoid/resource.json
index 82e49a6e..d79950eb 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Solenoid/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Solenoid/resource.json
@@ -9,8 +9,8 @@
   "attributes": {
     "lastModification": {
       "actor": "admin",
-      "timestamp": "2025-09-03T16:02:38Z"
+      "timestamp": "2025-09-12T08:08:56Z"
     },
-    "lastModificationSignature": "109467d2a982941cd8d35a0de3dba653a0770c79c2841c86a1e8e5873c9c65f7"
+    "lastModificationSignature": "b479ea192933c631dadde3cf0dc57f9b8e4102b6d919c6dc55def5fa970e3440"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Solenoid/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Solenoid/view.json
index 3afb82e0..5d947427 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Solenoid/view.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Solenoid/view.json
@@ -130,7 +130,7 @@
       "dom": {
         "onClick": {
           "config": {
-            "script": "\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})"
+            "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})"
           },
           "scope": "G",
           "type": "script"