diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/RealTime/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/RealTime/view.json
index 4424859..b9b0634 100644
--- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/RealTime/view.json
+++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Alarm-Views/RealTime/view.json
@@ -699,7 +699,7 @@
                           },
                           "value": {
                             "Description": "MCM01 Hello world",
-                            "Duration": "01:30:31",
+                            "Duration": "01:42:53",
                             "EventTimestamp": "2025-06-20 15:07:03",
                             "Location": "MCM01",
                             "NumberID": 35,
@@ -3536,7 +3536,7 @@
                               "boolean": "checkbox",
                               "dateFormat": "MM/DD/YYYY",
                               "editable": false,
-                              "field": "MCM",
+                              "field": "Location",
                               "filter": {
                                 "boolean": {
                                   "condition": ""
@@ -3726,7 +3726,7 @@
                                   "Duration": "00:00:06",
                                   "EndTimestamp": 1750417622000,
                                   "ID": 29,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417616000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3736,7 +3736,7 @@
                                   "Duration": "00:00:06",
                                   "EndTimestamp": 1750417622000,
                                   "ID": 30,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417616000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3746,7 +3746,7 @@
                                   "Duration": "00:00:06",
                                   "EndTimestamp": 1750417622000,
                                   "ID": 29,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417616000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3756,7 +3756,7 @@
                                   "Duration": "00:00:06",
                                   "EndTimestamp": 1750417622000,
                                   "ID": 30,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417616000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3766,7 +3766,7 @@
                                   "Duration": "00:00:06",
                                   "EndTimestamp": 1750417622000,
                                   "ID": 29,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417616000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3776,7 +3776,7 @@
                                   "Duration": "00:00:06",
                                   "EndTimestamp": 1750417622000,
                                   "ID": 30,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417616000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3786,7 +3786,7 @@
                                   "Duration": "00:00:06",
                                   "EndTimestamp": 1750417622000,
                                   "ID": 29,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417616000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3796,7 +3796,7 @@
                                   "Duration": "00:00:06",
                                   "EndTimestamp": 1750417622000,
                                   "ID": 30,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417616000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3806,7 +3806,7 @@
                                   "Duration": "00:00:16",
                                   "EndTimestamp": 1750417611000,
                                   "ID": 25,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417595000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3816,7 +3816,7 @@
                                   "Duration": "00:00:16",
                                   "EndTimestamp": 1750417611000,
                                   "ID": 26,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417595000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3826,7 +3826,7 @@
                                   "Duration": "00:00:16",
                                   "EndTimestamp": 1750417611000,
                                   "ID": 25,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417595000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3836,7 +3836,7 @@
                                   "Duration": "00:00:16",
                                   "EndTimestamp": 1750417611000,
                                   "ID": 26,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417595000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3846,7 +3846,7 @@
                                   "Duration": "00:00:16",
                                   "EndTimestamp": 1750417611000,
                                   "ID": 25,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417595000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3856,7 +3856,7 @@
                                   "Duration": "00:00:16",
                                   "EndTimestamp": 1750417611000,
                                   "ID": 26,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417595000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3866,7 +3866,7 @@
                                   "Duration": "00:00:16",
                                   "EndTimestamp": 1750417611000,
                                   "ID": 25,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417595000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3876,7 +3876,7 @@
                                   "Duration": "00:00:16",
                                   "EndTimestamp": 1750417611000,
                                   "ID": 26,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417595000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3886,7 +3886,7 @@
                                   "Duration": "00:00:07",
                                   "EndTimestamp": 1750417592000,
                                   "ID": 21,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417585000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3896,7 +3896,7 @@
                                   "Duration": "00:00:07",
                                   "EndTimestamp": 1750417592000,
                                   "ID": 22,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417585000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3906,7 +3906,7 @@
                                   "Duration": "00:00:07",
                                   "EndTimestamp": 1750417592000,
                                   "ID": 21,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417585000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3916,7 +3916,7 @@
                                   "Duration": "00:00:07",
                                   "EndTimestamp": 1750417592000,
                                   "ID": 22,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417585000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3926,7 +3926,7 @@
                                   "Duration": "00:00:07",
                                   "EndTimestamp": 1750417592000,
                                   "ID": 21,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417585000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3936,7 +3936,7 @@
                                   "Duration": "00:00:07",
                                   "EndTimestamp": 1750417592000,
                                   "ID": 22,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417585000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3946,7 +3946,7 @@
                                   "Duration": "00:00:07",
                                   "EndTimestamp": 1750417592000,
                                   "ID": 21,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417585000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3956,7 +3956,7 @@
                                   "Duration": "00:00:07",
                                   "EndTimestamp": 1750417592000,
                                   "ID": 22,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417585000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3966,7 +3966,7 @@
                                   "Duration": "00:00:05",
                                   "EndTimestamp": 1750417582000,
                                   "ID": 17,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417577000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3976,7 +3976,7 @@
                                   "Duration": "00:00:05",
                                   "EndTimestamp": 1750417582000,
                                   "ID": 18,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417577000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3986,7 +3986,7 @@
                                   "Duration": "00:00:05",
                                   "EndTimestamp": 1750417582000,
                                   "ID": 17,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417577000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -3996,7 +3996,7 @@
                                   "Duration": "00:00:05",
                                   "EndTimestamp": 1750417582000,
                                   "ID": 18,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417577000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -4006,7 +4006,7 @@
                                   "Duration": "00:00:05",
                                   "EndTimestamp": 1750417582000,
                                   "ID": 17,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417577000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -4016,7 +4016,7 @@
                                   "Duration": "00:00:05",
                                   "EndTimestamp": 1750417582000,
                                   "ID": 18,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417577000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -4026,7 +4026,7 @@
                                   "Duration": "00:00:05",
                                   "EndTimestamp": 1750417582000,
                                   "ID": 17,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417577000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -4036,7 +4036,7 @@
                                   "Duration": "00:00:05",
                                   "EndTimestamp": 1750417582000,
                                   "ID": 18,
-                                  "MCM": "MCM01",
+                                  "Location": "MCM01",
                                   "Priority": "Low",
                                   "StartTimestamp": 1750417577000,
                                   "Tag": "MCM01.HMI.Beacon_Light"
@@ -4046,7 +4046,7 @@
                                   "Duration": "00:00:07",
                                   "EndTimestamp": 1750417555000,
                                   "ID": 11,
-                                  "MCM": "FL2078_2_VFD1",
+                                  "Location": "MCM01",
                                   "Priority": "High",
                                   "StartTimestamp": 1750417548000,
                                   "Tag": "FL2078_2_VFD1.HMI.Voltage"
@@ -4056,7 +4056,7 @@
                                   "Duration": "00:00:07",
                                   "EndTimestamp": 1750417555000,
                                   "ID": 12,
-                                  "MCM": "FL2078_2_VFD1",
+                                  "Location": "MCM01",
                                   "Priority": "High",
                                   "StartTimestamp": 1750417548000,
                                   "Tag": "FL2078_2_VFD1.HMI.Voltage"
@@ -4066,7 +4066,7 @@
                                   "Duration": "00:00:07",
                                   "EndTimestamp": 1750417555000,
                                   "ID": 11,
-                                  "MCM": "FL2078_2_VFD1",
+                                  "Location": "MCM01",
                                   "Priority": "High",
                                   "StartTimestamp": 1750417548000,
                                   "Tag": "FL2078_2_VFD1.HMI.Voltage"
@@ -4076,7 +4076,7 @@
                                   "Duration": "00:00:07",
                                   "EndTimestamp": 1750417555000,
                                   "ID": 12,
-                                  "MCM": "FL2078_2_VFD1",
+                                  "Location": "MCM01",
                                   "Priority": "High",
                                   "StartTimestamp": 1750417548000,
                                   "Tag": "FL2078_2_VFD1.HMI.Voltage"
@@ -4086,7 +4086,7 @@
                                   "Duration": "00:00:07",
                                   "EndTimestamp": 1750417555000,
                                   "ID": 11,
-                                  "MCM": "FL2078_2_VFD1",
+                                  "Location": "MCM01",
                                   "Priority": "High",
                                   "StartTimestamp": 1750417548000,
                                   "Tag": "FL2078_2_VFD1.HMI.Voltage"
@@ -4096,7 +4096,7 @@
                                   "Duration": "00:00:07",
                                   "EndTimestamp": 1750417555000,
                                   "ID": 12,
-                                  "MCM": "FL2078_2_VFD1",
+                                  "Location": "MCM01",
                                   "Priority": "High",
                                   "StartTimestamp": 1750417548000,
                                   "Tag": "FL2078_2_VFD1.HMI.Voltage"
@@ -4106,7 +4106,7 @@
                                   "Duration": "00:00:07",
                                   "EndTimestamp": 1750417555000,
                                   "ID": 11,
-                                  "MCM": "FL2078_2_VFD1",
+                                  "Location": "MCM01",
                                   "Priority": "High",
                                   "StartTimestamp": 1750417548000,
                                   "Tag": "FL2078_2_VFD1.HMI.Voltage"
@@ -4116,7 +4116,7 @@
                                   "Duration": "00:00:07",
                                   "EndTimestamp": 1750417555000,
                                   "ID": 12,
-                                  "MCM": "FL2078_2_VFD1",
+                                  "Location": "MCM01",
                                   "Priority": "High",
                                   "StartTimestamp": 1750417548000,
                                   "Tag": "FL2078_2_VFD1.HMI.Voltage"
@@ -4126,7 +4126,7 @@
                                   "Duration": "00:00:25",
                                   "EndTimestamp": 1750417544000,
                                   "ID": 5,
-                                  "MCM": "FL2078_2_VFD1",
+                                  "Location": "MCM01",
                                   "Priority": "High",
                                   "StartTimestamp": 1750417519000,
                                   "Tag": "FL2078_2_VFD1.HMI.Voltage"
@@ -4136,7 +4136,7 @@
                                   "Duration": "00:00:25",
                                   "EndTimestamp": 1750417544000,
                                   "ID": 6,
-                                  "MCM": "FL2078_2_VFD1",
+                                  "Location": "MCM01",
                                   "Priority": "High",
                                   "StartTimestamp": 1750417519000,
                                   "Tag": "FL2078_2_VFD1.HMI.Voltage"
@@ -4146,7 +4146,7 @@
                                   "Duration": "00:00:25",
                                   "EndTimestamp": 1750417544000,
                                   "ID": 5,
-                                  "MCM": "FL2078_2_VFD1",
+                                  "Location": "MCM01",
                                   "Priority": "High",
                                   "StartTimestamp": 1750417519000,
                                   "Tag": "FL2078_2_VFD1.HMI.Voltage"
@@ -4156,7 +4156,7 @@
                                   "Duration": "00:00:25",
                                   "EndTimestamp": 1750417544000,
                                   "ID": 6,
-                                  "MCM": "FL2078_2_VFD1",
+                                  "Location": "MCM01",
                                   "Priority": "High",
                                   "StartTimestamp": 1750417519000,
                                   "Tag": "FL2078_2_VFD1.HMI.Voltage"
@@ -4166,7 +4166,7 @@
                                   "Duration": "00:00:25",
                                   "EndTimestamp": 1750417544000,
                                   "ID": 5,
-                                  "MCM": "FL2078_2_VFD1",
+                                  "Location": "MCM01",
                                   "Priority": "High",
                                   "StartTimestamp": 1750417519000,
                                   "Tag": "FL2078_2_VFD1.HMI.Voltage"
@@ -4176,7 +4176,7 @@
                                   "Duration": "00:00:25",
                                   "EndTimestamp": 1750417544000,
                                   "ID": 6,
-                                  "MCM": "FL2078_2_VFD1",
+                                  "Location": "MCM01",
                                   "Priority": "High",
                                   "StartTimestamp": 1750417519000,
                                   "Tag": "FL2078_2_VFD1.HMI.Voltage"
@@ -4186,7 +4186,7 @@
                                   "Duration": "00:00:25",
                                   "EndTimestamp": 1750417544000,
                                   "ID": 5,
-                                  "MCM": "FL2078_2_VFD1",
+                                  "Location": "MCM01",
                                   "Priority": "High",
                                   "StartTimestamp": 1750417519000,
                                   "Tag": "FL2078_2_VFD1.HMI.Voltage"
@@ -4196,7 +4196,7 @@
                                   "Duration": "00:00:25",
                                   "EndTimestamp": 1750417544000,
                                   "ID": 6,
-                                  "MCM": "FL2078_2_VFD1",
+                                  "Location": "MCM01",
                                   "Priority": "High",
                                   "StartTimestamp": 1750417519000,
                                   "Tag": "FL2078_2_VFD1.HMI.Voltage"
@@ -4212,16 +4212,15 @@
                             "data": [
                               {
                                 "Description": "MCM01 - Hello world",
-                                "Duration": "00:24:34",
+                                "Duration": "01:42:53",
                                 "EndTimestamp": null,
                                 "ID": 35,
-                                "MCM": "MCM01",
+                                "Location": "MCM01",
                                 "Priority": "Low",
                                 "StartTimestamp": 1750417623000,
                                 "Tag": "MCM01.HMI.Beacon_Light"
                               }
                             ],
-                            "selectedColumn": "MCM",
                             "selectedRow": 0
                           },
                           "style": {
@@ -4614,6 +4613,7 @@
           "contentStyle": {
             "classes": "Background-Styles/Grey-Background"
           },
+          "currentTabIndex": 2,
           "menuType": "modern",
           "style": {
             "classes": "Background-Styles/Grey-Background"
diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/named-query/GetAlarms/query.sql b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/named-query/GetAlarms/query.sql
index fc3d989..dc70857 100644
--- a/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/named-query/GetAlarms/query.sql
+++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/named-query/GetAlarms/query.sql
@@ -25,7 +25,7 @@ SELECT
     SUBSTRING_INDEX(aed.strValue, '/', -1)
   ) AS Tag,
 
-  Active.displaypath AS MCM
+  SUBSTRING_INDEX(SUBSTRING_INDEX(aed.strValue, '/', 2), '/', -1) AS Location
 
 FROM (
   SELECT