diff --git a/docgen/integrating-with-homeassistant.js b/docgen/integrating-with-homeassistant.js
index 4a94c493..dd4fc300 100644
--- a/docgen/integrating-with-homeassistant.js
+++ b/docgen/integrating-with-homeassistant.js
@@ -88,7 +88,7 @@ The following Home Assistant configuration allows you to control Zigbee2mqtt fro
 # Group
 group:
   zigbee_group:
-    view: no
+    view: false
     control: hidden
     name: Zigbee2mqtt
     entities:
@@ -184,6 +184,7 @@ automation:
 
   - id: disable_zigbee_join
     alias: Disable Zigbee joining
+    hide_entity: true
     trigger:
     - entity_id: input_boolean.zigbee_permit_join
       platform: state
diff --git a/docs/integration/home_assistant.md b/docs/integration/home_assistant.md
index f36051a3..a9755db6 100644
--- a/docs/integration/home_assistant.md
+++ b/docs/integration/home_assistant.md
@@ -219,7 +219,7 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     icon: "mdi:toggle-switch"
     value_template: "{{ value_json.click }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "battery"
       - "voltage"
@@ -238,7 +238,7 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     icon: "mdi:toggle-switch"
     value_template: "{{ value_json.click }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "battery"
       - "voltage"
@@ -257,7 +257,7 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     icon: "mdi:toggle-switch"
     value_template: "{{ value_json.click }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "battery"
       - "voltage"
@@ -276,7 +276,7 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     icon: "mdi:toggle-switch"
     value_template: "{{ value_json.click }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "battery"
       - "voltage"
@@ -295,7 +295,7 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     icon: "mdi:toggle-switch"
     value_template: "{{ value_json.click }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "battery"
       - "voltage"
@@ -338,7 +338,7 @@ sensor:
     unit_of_measurement: "Watt"
     icon: "mdi:flash"
     value_template: "{{ value_json.power }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "voltage"
       - "temperature"
@@ -359,7 +359,7 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_left }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/left/set"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "button_left"
 
@@ -371,7 +371,7 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_right }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/right/set"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "button_right"
 ```
@@ -388,7 +388,7 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_left }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/left/set"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "button_left"
 
@@ -400,7 +400,7 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_right }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/right/set"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "button_right"
 
@@ -411,7 +411,7 @@ sensor:
     unit_of_measurement: "Watt"
     icon: "mdi:flash"
     value_template: "{{ value_json.power }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "voltage"
       - "temperature"
@@ -431,7 +431,7 @@ sensor:
     unit_of_measurement: "°C"
     device_class: "temperature"
     value_template: "{{ value_json.temperature }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "battery"
       - "voltage"
@@ -443,7 +443,7 @@ sensor:
     unit_of_measurement: "%"
     device_class: "humidity"
     value_template: "{{ value_json.humidity }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "battery"
       - "voltage"
@@ -460,7 +460,7 @@ sensor:
     unit_of_measurement: "°C"
     device_class: "temperature"
     value_template: "{{ value_json.temperature }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "battery"
       - "voltage"
@@ -472,7 +472,7 @@ sensor:
     unit_of_measurement: "%"
     device_class: "humidity"
     value_template: "{{ value_json.humidity }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "battery"
       - "voltage"
@@ -484,7 +484,7 @@ sensor:
     unit_of_measurement: "hPa"
     device_class: "pressure"
     value_template: "{{ value_json.pressure }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "battery"
       - "voltage"
@@ -509,7 +509,7 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "voltage"
       - "action"
@@ -536,7 +536,7 @@ sensor:
     unit_of_measurement: "lx"
     device_class: "illuminance"
     value_template: "{{ value_json.illuminance }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "battery"
       - "voltage"
@@ -547,7 +547,7 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "voltage"
       - "action"
@@ -573,7 +573,7 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "voltage"
       - "action"
@@ -599,7 +599,7 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "voltage"
       - "action"
@@ -625,7 +625,7 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "voltage"
       - "action"
@@ -642,7 +642,7 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     icon: "mdi:gesture-double-tap"
     value_template: "{{ value_json.action }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "battery"
       - "voltage"
@@ -680,7 +680,7 @@ sensor:
     unit_of_measurement: "Watt"
     icon: "mdi:flash"
     value_template: "{{ value_json.power }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "voltage"
       - "temperature"
@@ -709,7 +709,7 @@ sensor:
     unit_of_measurement: "Watt"
     icon: "mdi:flash"
     value_template: "{{ value_json.power }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "voltage"
       - "temperature"
@@ -737,7 +737,7 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "voltage"
       - "action"
@@ -763,7 +763,7 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "voltage"
       - "action"
@@ -780,7 +780,7 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     icon: "mdi:lock"
     value_template: "{{ value_json.inserted }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "forgotten"
       - "keyerror"
@@ -796,7 +796,7 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     icon: "mdi:gesture-double-tap"
     value_template: "{{ value_json.action }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "battery"
       - "voltage"
@@ -947,7 +947,7 @@ sensor:
     unit_of_measurement: "brightness"
     icon: "mdi:brightness-5"
     value_template: "{{ value_json.brightness }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
 ```
 {% endraw %}
@@ -1284,7 +1284,7 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     icon: "mdi:gesture-double-tap"
     value_template: "{{ value_json.action }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "battery"
       - "voltage"
@@ -1322,7 +1322,7 @@ sensor:
     unit_of_measurement: "°C"
     device_class: "temperature"
     value_template: "{{ value_json.temperature }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "battery"
       - "voltage"
@@ -1334,7 +1334,7 @@ sensor:
     unit_of_measurement: "lx"
     device_class: "illuminance"
     value_template: "{{ value_json.illuminance }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "battery"
       - "voltage"
@@ -1345,7 +1345,7 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "voltage"
       - "action"
@@ -1385,7 +1385,7 @@ sensor:
     unit_of_measurement: "Watt"
     icon: "mdi:flash"
     value_template: "{{ value_json.power }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "voltage"
       - "temperature"
@@ -1412,7 +1412,7 @@ sensor:
     state_topic: "zigbee2mqtt/<FRIENDLY_NAME>"
     availability_topic: "zigbee2mqtt/bridge/state"
     value_template: "{{ value_json.linkquality }}"
-    json_attributes:
+    json_attributes: 
       - "description"
       - "type"
       - "rssi"
@@ -1444,7 +1444,7 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_left }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/left/set"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "button_left"
 
@@ -1456,7 +1456,7 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_right }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/right/set"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "button_right"
 ```
@@ -1473,7 +1473,7 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_left }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/left/set"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "button_left"
 
@@ -1485,7 +1485,7 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_right }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/right/set"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "button_right"
 
@@ -1497,7 +1497,7 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_center }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/center/set"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "button_center"
 ```
@@ -1514,7 +1514,7 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_bottom_left }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/bottom_left/set"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "button_bottom_left"
 
@@ -1526,7 +1526,7 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_bottom_right }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/bottom_right/set"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "button_bottom_right"
 
@@ -1538,7 +1538,7 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_top_left }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/top_left/set"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "button_top_left"
 
@@ -1550,7 +1550,7 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_top_right }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/top_right/set"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "button_top_right"
 ```
@@ -1817,7 +1817,7 @@ sensor:
     unit_of_measurement: "°C"
     device_class: "temperature"
     value_template: "{{ value_json.temperature }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "battery"
       - "voltage"
@@ -2098,7 +2098,7 @@ sensor:
     unit_of_measurement: "Watt"
     icon: "mdi:flash"
     value_template: "{{ value_json.power }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "voltage"
       - "temperature"
@@ -2346,7 +2346,7 @@ sensor:
     unit_of_measurement: "Watt"
     icon: "mdi:flash"
     value_template: "{{ value_json.power }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "voltage"
       - "temperature"
@@ -2394,7 +2394,7 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_left }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/left/set"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "button_left"
 
@@ -2406,7 +2406,7 @@ switch:
     payload_on: "ON"
     value_template: "{{ value_json.state_right }}"
     command_topic: "zigbee2mqtt/<FRIENDLY_NAME>/right/set"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "button_right"
 ```
@@ -2445,7 +2445,7 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "voltage"
       - "action"
@@ -2471,7 +2471,7 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "voltage"
       - "action"
@@ -2537,7 +2537,7 @@ sensor:
     availability_topic: "zigbee2mqtt/bridge/state"
     device_class: "battery"
     value_template: "{{ value_json.battery }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "voltage"
       - "action"
@@ -2578,7 +2578,7 @@ sensor:
     unit_of_measurement: "°C"
     device_class: "temperature"
     value_template: "{{ value_json.temperature }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "battery"
       - "voltage"
@@ -2674,7 +2674,7 @@ sensor:
     unit_of_measurement: "Watt"
     icon: "mdi:flash"
     value_template: "{{ value_json.power }}"
-    json_attributes:
+    json_attributes: 
       - "linkquality"
       - "voltage"
       - "temperature"