diff --git a/.resources/7aab023cf0f9382b6d6da2ed2bbcd3b4cccc621c643273d8b15fc499125ab144 b/.resources/7aab023cf0f9382b6d6da2ed2bbcd3b4cccc621c643273d8b15fc499125ab144
deleted file mode 100644
index 08c5b96b..00000000
Binary files a/.resources/7aab023cf0f9382b6d6da2ed2bbcd3b4cccc621c643273d8b15fc499125ab144 and /dev/null differ
diff --git a/.resources/b1ba720c725448b02f9f0a4a1b744c968cfcf7ca549b63ac1e6c8346df10b016 b/.resources/b1ba720c725448b02f9f0a4a1b744c968cfcf7ca549b63ac1e6c8346df10b016
new file mode 100644
index 00000000..69f14c99
Binary files /dev/null and b/.resources/b1ba720c725448b02f9f0a4a1b744c968cfcf7ca549b63ac1e6c8346df10b016 differ
diff --git a/.resources/b1969eb2cf2dbea4302e342fedfe3aa3f0205500cf903a401de03a437f128fd0 b/.resources/c4a3ed41d001cd751f926312fb3f8f98213827f70bb38648850c8865fa4d2708
similarity index 98%
rename from .resources/b1969eb2cf2dbea4302e342fedfe3aa3f0205500cf903a401de03a437f128fd0
rename to .resources/c4a3ed41d001cd751f926312fb3f8f98213827f70bb38648850c8865fa4d2708
index 0360a08c..5adbed89 100644
--- a/.resources/b1969eb2cf2dbea4302e342fedfe3aa3f0205500cf903a401de03a437f128fd0
+++ b/.resources/c4a3ed41d001cd751f926312fb3f8f98213827f70bb38648850c8865fa4d2708
@@ -188,7 +188,7 @@
       "meta.visible": {
         "binding": {
           "config": {
-            "path": "session.custom.alarm_filter.show_beacons"
+            "path": "session.custom.alarm_filter.show_px"
           },
           "type": "property"
         }
diff --git a/BNA8/com.inductiveautomation.perspective/page-config/resource.json b/BNA8/com.inductiveautomation.perspective/page-config/resource.json
index 31475ad7..a7349b37 100644
--- a/BNA8/com.inductiveautomation.perspective/page-config/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/page-config/resource.json
@@ -8,9 +8,9 @@
   ],
   "attributes": {
     "lastModification": {
-      "actor": "external",
-      "timestamp": "2025-08-18T17:00:42Z"
+      "actor": "admin",
+      "timestamp": "2025-08-18T17:06:14Z"
     },
-    "lastModificationSignature": "33b6bad9edc3c17cfb3e6917447d214b10a006a342158d1dc6e7787018d5032f"
+    "lastModificationSignature": "e233175b59a33bd771a4aa14f8361dc017245fb277350dfec8fe8b28dccbf4d5"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/session-props/props.json b/BNA8/com.inductiveautomation.perspective/session-props/props.json
index 26ef228f..f20e013d 100644
--- a/BNA8/com.inductiveautomation.perspective/session-props/props.json
+++ b/BNA8/com.inductiveautomation.perspective/session-props/props.json
@@ -13,7 +13,8 @@
       "show_fio_safety": true,
       "show_map": true,
       "show_photoeyes": true,
-      "show_px": true
+      "show_px": true,
+      "show_solenoids": true
     },
     "areaHover": [],
     "currentGraphic": "Windows/Graphics/Overview",
diff --git a/BNA8/com.inductiveautomation.perspective/session-props/resource.json b/BNA8/com.inductiveautomation.perspective/session-props/resource.json
index 2bcf1bd5..78c6daa8 100644
--- a/BNA8/com.inductiveautomation.perspective/session-props/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/session-props/resource.json
@@ -9,8 +9,8 @@
   "attributes": {
     "lastModification": {
       "actor": "admin",
-      "timestamp": "2025-08-18T16:57:55Z"
+      "timestamp": "2025-08-18T17:09:15Z"
     },
-    "lastModificationSignature": "ddc489c620faaaf3614c708dc6c093665bcc5c336fb1ccc3a55373beb285ba2a"
+    "lastModificationSignature": "19a8d32576a5dd2328dbbea9daca214777e3fc8e92321f2078245fef0d36a4c3"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/Windows/Graphics/Overview/resource.json b/BNA8/com.inductiveautomation.perspective/views/Windows/Graphics/Overview/resource.json
index 4d967627..38b72ad7 100644
--- a/BNA8/com.inductiveautomation.perspective/views/Windows/Graphics/Overview/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/views/Windows/Graphics/Overview/resource.json
@@ -9,9 +9,9 @@
   ],
   "attributes": {
     "lastModification": {
-      "actor": "external",
-      "timestamp": "2025-08-18T17:00:42Z"
+      "actor": "admin",
+      "timestamp": "2025-08-18T17:06:35Z"
     },
-    "lastModificationSignature": "42310c2bc66bb426a2566881ee90a4585465b08798ab0856683866deb241a93f"
+    "lastModificationSignature": "f7ce6455e576f34a531726016f349810dc2ef53652ec32614f8452f8840bb016"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM01-FLUID INBOUND/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM01-FLUID INBOUND/resource.json
index 97cbfe6d..a721fa00 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM01-FLUID INBOUND/resource.json	
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM01-FLUID INBOUND/resource.json	
@@ -9,9 +9,9 @@
   ],
   "attributes": {
     "lastModification": {
-      "actor": "external",
-      "timestamp": "2025-08-18T17:00:42Z"
+      "actor": "admin",
+      "timestamp": "2025-08-18T17:06:35Z"
     },
-    "lastModificationSignature": "3de81ff088f352e83b2daeaa76574c818c83cdea076b4ed11a2f52b24d16e6b1"
+    "lastModificationSignature": "ab4eee9ffbf14a771f611261d4e2b383847e0d0ef4246d845453bca8f3937979"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/resource.json
index 7fb348a5..3f956807 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/resource.json
@@ -9,9 +9,9 @@
   ],
   "attributes": {
     "lastModification": {
-      "actor": "external",
-      "timestamp": "2025-08-18T16:55:42Z"
+      "actor": "admin",
+      "timestamp": "2025-08-18T17:10:18Z"
     },
-    "lastModificationSignature": "31ddea76b3ecfb7def00184c58da0ad37388d8915ba585cf3a23e876c6f5ea0c"
+    "lastModificationSignature": "ca8be9c37bbcbadf5ed96232cff9fa89d84bd494ccdc12cb2ac039dcfb4e21e3"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/thumbnail.png
index b7c4ddf8..3dff2d1e 100644
Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/thumbnail.png differ
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/view.json
index 6469c543..9928bedf 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/view.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/view.json
@@ -620,7 +620,7 @@
                       "enabled": true,
                       "rate": "3"
                     },
-                    "queryPath": "GetActiveAlarmsByLocationAndPriority",
+                    "queryPath": "Alarms-autStand/GetActiveAlarmsByLocationAndPriority",
                     "returnFormat": "json"
                   },
                   "transforms": [
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSwitch/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSwitch/resource.json
index ba036427..285f16df 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSwitch/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSwitch/resource.json
@@ -8,9 +8,9 @@
   ],
   "attributes": {
     "lastModification": {
-      "actor": "external",
-      "timestamp": "2025-08-18T16:55:42Z"
+      "actor": "admin",
+      "timestamp": "2025-08-18T17:08:46Z"
     },
-    "lastModificationSignature": "f8786139a3f1492627e7d3464cebcf9126e65143515a7a05429d167fa22c2aa9"
+    "lastModificationSignature": "721db10ed0e52f538b0c1ac2ad648791f90fdf9144b06aa5348ae9eba45b141c"
   }
 }
\ 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/ProxSwitch/view.json
index 0360a08c..5adbed89 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSwitch/view.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/ProxSwitch/view.json
@@ -188,7 +188,7 @@
       "meta.visible": {
         "binding": {
           "config": {
-            "path": "session.custom.alarm_filter.show_beacons"
+            "path": "session.custom.alarm_filter.show_px"
           },
           "type": "property"
         }
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 03f0db19..260ed4af 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Solenoid/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Solenoid/resource.json
@@ -8,9 +8,9 @@
   ],
   "attributes": {
     "lastModification": {
-      "actor": "external",
-      "timestamp": "2025-08-18T16:55:42Z"
+      "actor": "admin",
+      "timestamp": "2025-08-18T17:08:57Z"
     },
-    "lastModificationSignature": "6b65e5c700d932dcadec1b0a6be51d4b3cda8764b3536730418c2b8b94b07f8a"
+    "lastModificationSignature": "51e9a0e7a2aafdff7528728f9d3d333ce4c0d2a6a1cbf510d703bd4536d57c02"
   }
 }
\ 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 f2595593..f01067fb 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Solenoid/view.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Solenoid/view.json
@@ -2,8 +2,8 @@
   "custom": {
     "plc": "",
     "searchId": "value",
-    "state": 1,
-    "string": "Actuated"
+    "state": 0,
+    "string": "Inactive"
   },
   "params": {
     "tagProps": [
@@ -188,7 +188,7 @@
       "meta.visible": {
         "binding": {
           "config": {
-            "path": "session.custom.alarm_filter.show_beacons"
+            "path": "session.custom.alarm_filter.show_solenoids"
           },
           "type": "property"
         }
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/resource.json
index d123c5e6..b085b855 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/resource.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/resource.json
@@ -9,9 +9,9 @@
   ],
   "attributes": {
     "lastModification": {
-      "actor": "external",
-      "timestamp": "2025-08-18T16:55:42Z"
+      "actor": "admin",
+      "timestamp": "2025-08-18T17:07:31Z"
     },
-    "lastModificationSignature": "1d9446235fbf63495abfea7af0c230820650921ac7efccf37030e790796dde76"
+    "lastModificationSignature": "3d57ad96a1346126c73b545dd5158455d74c8636fd07af5257370dc0fd643420"
   }
 }
\ No newline at end of file
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/thumbnail.png
index b8b7091c..8146059a 100644
Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/thumbnail.png differ
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/view.json
index 3ef3878a..b9a38782 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/view.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/view.json
@@ -85,7 +85,7 @@
                   "props.selected": {
                     "binding": {
                       "config": {
-                        "expression": "if({session.custom.alarm_filter.show_dpm_mcm} \u0026\u0026 \r\n{session.custom.alarm_filter.show_beacons} \u0026\u0026\r\n{session.custom.alarm_filter.show_VFD} \u0026\u0026\r\n{session.custom.alarm_filter.show_buttons} \u0026\u0026\r\n{session.custom.alarm_filter.show_photoeyes} \u0026\u0026\r\n{session.custom.alarm_filter.show_encoders} \u0026\u0026\r\n{session.custom.alarm_filter.show_epc} \u0026\u0026\r\n{session.custom.alarm_filter.show_px} \u0026\u0026\r\n{session.custom.alarm_filter.show_camera_jams} \u0026\u0026\r\n{session.custom.alarm_filter.show_fio_safety}, True, False)"
+                        "expression": "if({session.custom.alarm_filter.show_dpm_mcm} \u0026\u0026 \r\n{session.custom.alarm_filter.show_beacons} \u0026\u0026\r\n{session.custom.alarm_filter.show_VFD} \u0026\u0026\r\n{session.custom.alarm_filter.show_buttons} \u0026\u0026\r\n{session.custom.alarm_filter.show_photoeyes} \u0026\u0026\r\n{session.custom.alarm_filter.show_encoders} \u0026\u0026\r\n{session.custom.alarm_filter.show_epc} \u0026\u0026\r\n{session.custom.alarm_filter.show_px} \u0026\u0026\r\n{session.custom.alarm_filter.show_camera_jams} \u0026\u0026\r\n{session.custom.alarm_filter.show_solenoids} \u0026\u0026\r\n{session.custom.alarm_filter.show_fio_safety}, True, False)"
                       },
                       "type": "expr"
                     }
@@ -869,6 +869,82 @@
                   ]
                 },
                 "type": "ia.input.checkbox"
+              },
+              {
+                "custom": {
+                  "buttonid": "status_filters/running_status"
+                },
+                "events": {
+                  "component": {
+                    "onActionPerformed": {
+                      "config": {
+                        "script": "\tif not self.props.selected:\n\t\tbuttonid \u003d self.custom.buttonid\n\t\tactivityLog.logger.callLogger(self.view, \u0027click\u0027, buttonid)\n\t\tactivityLog.productMetrics.callLogger(self.view, \u0027click\u0027, buttonid)"
+                      },
+                      "scope": "G",
+                      "type": "script"
+                    }
+                  }
+                },
+                "meta": {
+                  "name": "Show-Sols",
+                  "tooltip": {
+                    "delay": 250
+                  }
+                },
+                "position": {
+                  "basis": "36px"
+                },
+                "propConfig": {
+                  "props.enabled": {
+                    "binding": {
+                      "config": {
+                        "expression": "if ({session.custom.alarm_filter.show_map}\u003dTrue \u0026\u0026 {session.custom.view_in_focus}\u003d\u0027/MAP-Home\u0027, True, False)"
+                      },
+                      "enabled": false,
+                      "type": "expr"
+                    }
+                  },
+                  "props.selected": {
+                    "binding": {
+                      "config": {
+                        "bidirectional": true,
+                        "path": "session.custom.alarm_filter.show_solenoids"
+                      },
+                      "type": "property"
+                    }
+                  }
+                },
+                "props": {
+                  "checkedIcon": {
+                    "color": {
+                      "disabled": "#FFFFFF",
+                      "enabled": "#FFFFFF"
+                    }
+                  },
+                  "style": {
+                    "color": "#FFFFFF",
+                    "fontFamily": "Arial",
+                    "fontSize": 12,
+                    "fontWeight": "bold",
+                    "marginLeft": 10,
+                    "marginRight": 10
+                  },
+                  "text": "Show Solenoids"
+                },
+                "scripts": {
+                  "customMethods": [],
+                  "extensionFunctions": null,
+                  "messageHandlers": [
+                    {
+                      "messageType": "select-all-filters",
+                      "pageScope": false,
+                      "script": "\tdata \u003d payload[\"data\"]\n\tself.props.selected \u003d data",
+                      "sessionScope": false,
+                      "viewScope": true
+                    }
+                  ]
+                },
+                "type": "ia.input.checkbox"
               }
             ],
             "meta": {