diff --git a/packages/plant_snmp.yaml b/packages/plant_snmp.yaml
index 5ed139f..d45d86f 100644
--- a/packages/plant_snmp.yaml
+++ b/packages/plant_snmp.yaml
@@ -542,36 +542,44 @@ sensor:
     method: left
     unique_id: pfv_garage_pdu_energy
 
-# --- Rate-of-change early warning (#682): +10°F/15min = AC trouble [#344] ---
-# DRAC sensors quantize to whole °C and FLAP ~1.8°F between polls; raw-fed
-# trend sensors false-tripped TEMP RISING FAST (2026-09-06 05:02 CDT, tsys6).
-# Trend inputs are 5-min time-weighted moving averages — real climbs survive
-# the smoothing, quantization flapping does not.
-filter:
-  - platform: time_simple_moving_average
+  # --- Smoothed ambient feeds for the trend sensors (2026-09-06) ---
+  # DRAC sensors quantize to whole °C and FLAP ~1.8°F between polls; raw-fed
+  # trend sensors false-tripped TEMP RISING FAST (05:02 CDT, tsys6). Trend
+  # inputs are 5-min time-weighted moving averages (legacy filter SENSOR
+  # platform — a top-level `filter:` key cannot be merged from packages).
+  # Real climbs survive the smoothing, quantization flapping does not.
+  - platform: filter
     name: "PFV tsys1 rack temperature smoothed"
-    entity_id: sensor.pfv_tsys1_rack_temperature
-    window: "00:05:00"
-    precision: 2
     unique_id: pfv_tsys1_rack_temperature_smoothed
-  - platform: time_simple_moving_average
+    entity_id: sensor.pfv_tsys1_rack_temperature
+    filters:
+      - filter: time_simple_moving_average
+        window: "00:05"
+        precision: 2
+  - platform: filter
     name: "PFV tsys6 DRAC ambient smoothed"
-    entity_id: sensor.pfv_tsys6_drac_ambient
-    window: "00:05:00"
-    precision: 2
     unique_id: pfv_tsys6_drac_ambient_smoothed
-  - platform: time_simple_moving_average
+    entity_id: sensor.pfv_tsys6_drac_ambient
+    filters:
+      - filter: time_simple_moving_average
+        window: "00:05"
+        precision: 2
+  - platform: filter
     name: "PFV tsys7 DRAC inlet smoothed"
-    entity_id: sensor.pfv_tsys7_drac_inlet
-    window: "00:05:00"
-    precision: 2
     unique_id: pfv_tsys7_drac_inlet_smoothed
-  - platform: time_simple_moving_average
+    entity_id: sensor.pfv_tsys7_drac_inlet
+    filters:
+      - filter: time_simple_moving_average
+        window: "00:05"
+        precision: 2
+  - platform: filter
     name: "PFV garage temperature smoothed"
-    entity_id: sensor.pfv_garage_temperature
-    window: "00:05:00"
-    precision: 2
     unique_id: pfv_garage_temperature_smoothed
+    entity_id: sensor.pfv_garage_temperature
+    filters:
+      - filter: time_simple_moving_average
+        window: "00:05"
+        precision: 2
 
 binary_sensor:
   - platform: trend
diff --git a/packages/ups_shutdown.yaml b/packages/ups_shutdown.yaml
index b4ca765..e84da2c 100644
--- a/packages/ups_shutdown.yaml
+++ b/packages/ups_shutdown.yaml
@@ -24,14 +24,15 @@ input_boolean:
   # mid-test silently reverts these to the safe defaults (armed OFF,
   # dry-run ON). Safe direction, but re-arm after any restart during the
   # supervised Sept 11-12 live test.
+  # (no description: keys — input_boolean rejects them, 2026-09-06)
   pfv_ups_shutdown_armed:
+    # Founder arm. ON + dry-run OFF = real shutdown dispatch.
     name: UPS shutdown chain ARMED
-    description: Founder-level arm. ON + dry-run OFF = real shutdown dispatch.
     icon: mdi:power-standby
     initial: false
   pfv_ups_shutdown_dry_run:
+    # ON (default) = log/page the plan only, touch nothing.
     name: UPS shutdown DRY RUN
-    description: ON (default) = log/page the plan only, touch nothing.
     icon: mdi:numeric-1-box-outline
     initial: true