Slight improvements to Delivery Mode

flows.json

@@ -1239,10 +1239,14 @@
             "cfd6c59d35ffa1dc",
             "a2ec35a79d79bf2f",
             "9a8c39dc1a0c20e6",
-            "528d5448879fd3db"
+            "528d5448879fd3db",
+            "3e6caa91031ab102",
+            "8c29a2e1a06c5524"
         ],
         "x": 54,
-        "y": 19
+        "y": 19,
+        "w": 2152,
+        "h": 282
     },
     {
         "id": "0c81dfaed25d225c",
@@ -13482,7 +13486,7 @@
         "queue": "none",
         "output_location": "",
         "output_location_type": "none",
-        "x": 1710,
+        "x": 1910,
         "y": 260,
         "wires": [
             []
@@ -13972,7 +13976,7 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1900,
+        "x": 2100,
         "y": 200,
         "wires": [
             []
@@ -14028,7 +14032,7 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1710,
+        "x": 1910,
         "y": 200,
         "wires": [
             [
@@ -14048,7 +14052,7 @@
         "initialize": "",
         "finalize": "",
         "libs": [],
-        "x": 1500,
+        "x": 1700,
         "y": 260,
         "wires": [
             [
@@ -14126,7 +14130,7 @@
         "y": 260,
         "wires": [
             [
-                "dfa6bff034d7d522"
+                "3e6caa91031ab102"
             ],
             []
         ]
@@ -14272,6 +14276,103 @@
         ],
         "l": false
     },
+    {
+        "id": "3e6caa91031ab102",
+        "type": "api-current-state",
+        "z": "b5717a86ce55bc29",
+        "g": "eeafd13be593ae69",
+        "name": "Delivery Mode",
+        "server": "9e87348d.9c1c48",
+        "version": 3,
+        "outputs": 2,
+        "halt_if": "off",
+        "halt_if_type": "str",
+        "halt_if_compare": "is",
+        "entity_id": "input_boolean.delivery_mode",
+        "state_type": "str",
+        "blockInputOverrides": false,
+        "outputProperties": [
+            {
+                "property": "payload",
+                "propertyType": "msg",
+                "value": "",
+                "valueType": "entityState"
+            }
+        ],
+        "for": "0",
+        "forType": "num",
+        "forUnits": "minutes",
+        "override_topic": false,
+        "state_location": "payload",
+        "override_payload": "msg",
+        "entity_location": "data",
+        "override_data": "msg",
+        "x": 1500,
+        "y": 260,
+        "wires": [
+            [
+                "dfa6bff034d7d522"
+            ],
+            []
+        ],
+        "outputLabels": [
+            "Off",
+            "On"
+        ]
+    },
+    {
+        "id": "8c29a2e1a06c5524",
+        "type": "server-state-changed",
+        "z": "b5717a86ce55bc29",
+        "g": "eeafd13be593ae69",
+        "name": "Delivery Mode Off",
+        "server": "9e87348d.9c1c48",
+        "version": 4,
+        "exposeToHomeAssistant": false,
+        "haConfig": [
+            {
+                "property": "name",
+                "value": ""
+            },
+            {
+                "property": "icon",
+                "value": ""
+            }
+        ],
+        "entityidfilter": "input_boolean.delivery_mode",
+        "entityidfiltertype": "exact",
+        "outputinitially": false,
+        "state_type": "str",
+        "haltifstate": "off",
+        "halt_if_type": "str",
+        "halt_if_compare": "is",
+        "outputs": 2,
+        "output_only_on_state_change": true,
+        "for": "0",
+        "forType": "num",
+        "forUnits": "minutes",
+        "ignorePrevStateNull": false,
+        "ignorePrevStateUnknown": true,
+        "ignorePrevStateUnavailable": true,
+        "ignoreCurrentStateUnknown": true,
+        "ignoreCurrentStateUnavailable": true,
+        "outputProperties": [
+            {
+                "property": "payload",
+                "propertyType": "msg",
+                "value": "",
+                "valueType": "entityState"
+            }
+        ],
+        "x": 850,
+        "y": 200,
+        "wires": [
+            [
+                "51237623ed73ba98"
+            ],
+            []
+        ]
+    },
     {
         "id": "cd04bdb407311eb5",
         "type": "ha-button",