diff --git a/template/aircondition.yaml b/template/aircondition.yaml
index 2b9c936..a252d22 100644
--- a/template/aircondition.yaml
+++ b/template/aircondition.yaml
@@ -18,7 +18,7 @@
       state_class: measurement
 
     - name: AirCondition Power Factor
-      availability: "{{ states.sensor.aircondition_spaending | float(0) > 0 }}"
+      availability: "{{ states.sensor.aircondition_spaending.state | float(0) > 0 }}"
       state: |
         {# Calculate power factor #}
         {% set v = states.sensor.aircondition_spaending.state | float %}
diff --git a/template/computer-plug.yaml b/template/computer-plug.yaml
index 76d2de2..fd48940 100644
--- a/template/computer-plug.yaml
+++ b/template/computer-plug.yaml
@@ -18,7 +18,7 @@
       state_class: measurement
 
     - name: Computer Power Factor
-      availability: "{{ states.sensor.computer_spaending | float(0) > 0 }}"
+      availability: "{{ states.sensor.computer_spaending.state | float(0) > 0 }}"
       state: |
         {# Calculate power factor #}
         {% set v = states.sensor.computer_spaending.state | float %}
diff --git a/template/mikroovn.yaml b/template/mikroovn.yaml
index 813e673..94aad95 100644
--- a/template/mikroovn.yaml
+++ b/template/mikroovn.yaml
@@ -1,6 +1,6 @@
 - sensor:
     - name: Mikroovn Power Factor
-      availability: "{{ states.sensor.mikroovn_voltage | float(0) > 0 }}"
+      availability: "{{ states.sensor.mikroovn_voltage.state | float(0) > 0 }}"
       state: |
         {# Calculate power factor #}
         {% set v = states.sensor.mikroovn_voltage.state | float %}
diff --git a/template/opvaskemaskine.yaml b/template/opvaskemaskine.yaml
index 6405052..1d4a883 100644
--- a/template/opvaskemaskine.yaml
+++ b/template/opvaskemaskine.yaml
@@ -18,7 +18,7 @@
       state_class: measurement
 
     - name: Opvaskemaskine Power Factor
-      availability: "{{ states.sensor.opvaskemaskine_spaending | float(0) > 0 }}"
+      availability: "{{ states.sensor.opvaskemaskine_spaending.state | float(0) > 0 }}"
       state: |
         {# Calculate power factor #}
         {% set v = states.sensor.opvaskemaskine_spaending.state | float %}
diff --git a/template/teknikskab.yaml b/template/teknikskab.yaml
index 423e143..902d853 100644
--- a/template/teknikskab.yaml
+++ b/template/teknikskab.yaml
@@ -18,7 +18,7 @@
       state_class: measurement
 
     - name: Teknikskab Power Factor
-      availability: "{{ states.sensor.teknikskab_spaending | default(0) | float(0) > 0 }}"
+      availability: "{{ states.sensor.teknikskab_spaending.state | default(0) | float(0) > 0 }}"
       state: |
         {# Calculate power factor #}
         {% set v = states.sensor.teknikskab_spaending.state | float %}
diff --git a/template/tv_baenk.yaml b/template/tv_baenk.yaml
index 6abdb0b..6ea0693 100644
--- a/template/tv_baenk.yaml
+++ b/template/tv_baenk.yaml
@@ -18,7 +18,7 @@
       state_class: measurement
 
     - name: TV Bænk Power Factor
-      availability: "{{ states.sensor.tv_baenk_spaending | default(0) | float(0) > 0 }}"
+      availability: "{{ states.sensor.tv_baenk_spaending.state | default(0) | float(0) > 0 }}"
       state: |
         {# Calculate power factor #}
         {% set v = states.sensor.tv_baenk_spaending.state | float %}
diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json
index 4351480..c6132ba 100644
--- a/zigbee2mqtt/state.json
+++ b/zigbee2mqtt/state.json
@@ -3,9 +3,20 @@
         "update": {
             "state": "idle"
         },
-        "linkquality": 87,
+        "linkquality": 90,
         "state": "ON",
         "brightness": 254,
         "power_on_behavior": "on"
+    },
+    "0xa4c1387b259019f2": {
+        "energy": 0,
+        "power": 25,
+        "current": 0.11,
+        "voltage": 233,
+        "state": "ON",
+        "power_outage_memory": "on",
+        "indicator_mode": "off/on",
+        "child_lock": "UNLOCK",
+        "linkquality": 39
     }
 }
\ No newline at end of file