diff --git a/Applications/template_pi-hole_api/6.0/template_pi-hole_api.yaml b/Applications/template_pi-hole_api/6.0/template_pi-hole_api.yaml
index 101f5625f..4289a55d7 100644
--- a/Applications/template_pi-hole_api/6.0/template_pi-hole_api.yaml
+++ b/Applications/template_pi-hole_api/6.0/template_pi-hole_api.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-21T22:00:37Z'
+  date: '2022-04-02T04:03:09Z'
   groups:
     -
       uuid: 7df96b18c230490a9a0a9e2307226338
@@ -101,8 +101,6 @@ zabbix_export:
         ## Author
         
         Undefined_ID
-        
-        
       groups:
         -
           name: Templates
@@ -133,10 +131,6 @@ zabbix_export:
               type: JSONPATH
               parameters:
                 - $.ads_blocked_today
-            -
-              type: SIMPLE_CHANGE
-              parameters:
-                - ''
           master_item:
             key: json.pihole
           tags:
@@ -189,10 +183,6 @@ zabbix_export:
               type: JSONPATH
               parameters:
                 - $.dns_queries_all_types
-            -
-              type: SIMPLE_CHANGE
-              parameters:
-                - ''
           master_item:
             key: json.pihole
           tags:
@@ -210,10 +200,6 @@ zabbix_export:
               type: JSONPATH
               parameters:
                 - $.dns_queries_today
-            -
-              type: SIMPLE_CHANGE
-              parameters:
-                - ''
           master_item:
             key: json.pihole
           tags:
@@ -249,10 +235,6 @@ zabbix_export:
               type: JSONPATH
               parameters:
                 - $.queries_cached
-            -
-              type: SIMPLE_CHANGE
-              parameters:
-                - ''
           master_item:
             key: json.pihole
           tags:
@@ -270,10 +252,6 @@ zabbix_export:
               type: JSONPATH
               parameters:
                 - $.queries_forwarded
-            -
-              type: SIMPLE_CHANGE
-              parameters:
-                - ''
           master_item:
             key: json.pihole
           tags:
@@ -311,10 +289,6 @@ zabbix_export:
               type: JSONPATH
               parameters:
                 - '$[''querytypes''][''A (IPv4)'']'
-            -
-              type: SIMPLE_CHANGE
-              parameters:
-                - ''
           master_item:
             key: json.pihole.querytypes
           tags:
@@ -334,10 +308,6 @@ zabbix_export:
               type: JSONPATH
               parameters:
                 - '$[''querytypes''][''AAAA (IPv6)'']'
-            -
-              type: SIMPLE_CHANGE
-              parameters:
-                - ''
           master_item:
             key: json.pihole.querytypes
           tags:
@@ -357,10 +327,6 @@ zabbix_export:
               type: JSONPATH
               parameters:
                 - '$[''querytypes''][''ANY'']'
-            -
-              type: SIMPLE_CHANGE
-              parameters:
-                - ''
           master_item:
             key: json.pihole.querytypes
           tags:
@@ -373,16 +339,13 @@ zabbix_export:
           type: DEPENDENT
           key: json.pihole.querytypes.dnskey
           delay: '0'
+          value_type: FLOAT
           units: '!'
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - '$[''querytypes''][''DNSKEY'']'
-            -
-              type: SIMPLE_CHANGE
-              parameters:
-                - ''
           master_item:
             key: json.pihole.querytypes
           tags:
@@ -395,16 +358,13 @@ zabbix_export:
           type: DEPENDENT
           key: json.pihole.querytypes.ds
           delay: '0'
+          value_type: FLOAT
           units: '!'
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - '$[''querytypes''][''DS'']'
-            -
-              type: SIMPLE_CHANGE
-              parameters:
-                - ''
           master_item:
             key: json.pihole.querytypes
           tags:
@@ -417,16 +377,13 @@ zabbix_export:
           type: DEPENDENT
           key: json.pihole.querytypes.mx
           delay: '0'
+          value_type: FLOAT
           units: '!'
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - '$[''querytypes''][''MX'']'
-            -
-              type: SIMPLE_CHANGE
-              parameters:
-                - ''
           master_item:
             key: json.pihole.querytypes
           tags:
@@ -446,10 +403,6 @@ zabbix_export:
               type: JSONPATH
               parameters:
                 - '$[''querytypes''][''NAPTR'']'
-            -
-              type: SIMPLE_CHANGE
-              parameters:
-                - ''
           master_item:
             key: json.pihole.querytypes
           tags:
@@ -468,10 +421,6 @@ zabbix_export:
               type: JSONPATH
               parameters:
                 - '$[''querytypes''][''OTHER'']'
-            -
-              type: SIMPLE_CHANGE
-              parameters:
-                - ''
           master_item:
             key: json.pihole.querytypes
           tags:
@@ -491,10 +440,6 @@ zabbix_export:
               type: JSONPATH
               parameters:
                 - '$[''querytypes''][''PTR'']'
-            -
-              type: SIMPLE_CHANGE
-              parameters:
-                - ''
           master_item:
             key: json.pihole.querytypes
           tags:
@@ -507,16 +452,13 @@ zabbix_export:
           type: DEPENDENT
           key: json.pihole.querytypes.rrsig
           delay: '0'
+          value_type: FLOAT
           units: '!'
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - '$[''querytypes''][''RRSIG'']'
-            -
-              type: SIMPLE_CHANGE
-              parameters:
-                - ''
           master_item:
             key: json.pihole.querytypes
           tags:
@@ -536,10 +478,6 @@ zabbix_export:
               type: JSONPATH
               parameters:
                 - '$[''querytypes''][''SOA'']'
-            -
-              type: SIMPLE_CHANGE
-              parameters:
-                - ''
           master_item:
             key: json.pihole.querytypes
           tags:
@@ -559,10 +497,6 @@ zabbix_export:
               type: JSONPATH
               parameters:
                 - '$[''querytypes''][''SRV'']'
-            -
-              type: SIMPLE_CHANGE
-              parameters:
-                - ''
           master_item:
             key: json.pihole.querytypes
           tags:
@@ -582,10 +516,6 @@ zabbix_export:
               type: JSONPATH
               parameters:
                 - '$[''querytypes''][''TXT'']'
-            -
-              type: SIMPLE_CHANGE
-              parameters:
-                - ''
           master_item:
             key: json.pihole.querytypes
           tags:
@@ -603,10 +533,6 @@ zabbix_export:
               type: JSONPATH
               parameters:
                 - $.reply_CNAME
-            -
-              type: SIMPLE_CHANGE
-              parameters:
-                - ''
           master_item:
             key: json.pihole
           tags:
@@ -619,15 +545,13 @@ zabbix_export:
           type: DEPENDENT
           key: json.pihole.reply_IP
           delay: '0'
+          trends: '0'
+          value_type: TEXT
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - $.reply_IP
-            -
-              type: SIMPLE_CHANGE
-              parameters:
-                - ''
           master_item:
             key: json.pihole
           tags:
@@ -645,10 +569,6 @@ zabbix_export:
               type: JSONPATH
               parameters:
                 - $.reply_NODATA
-            -
-              type: SIMPLE_CHANGE
-              parameters:
-                - ''
           master_item:
             key: json.pihole
           tags:
@@ -666,10 +586,6 @@ zabbix_export:
               type: JSONPATH
               parameters:
                 - $.reply_NXDOMAIN
-            -
-              type: SIMPLE_CHANGE
-              parameters:
-                - ''
           master_item:
             key: json.pihole
           tags:
@@ -704,10 +620,6 @@ zabbix_export:
               type: JSONPATH
               parameters:
                 - $.unique_domains
-            -
-              type: SIMPLE_CHANGE
-              parameters:
-                - ''
           master_item:
             key: json.pihole
           tags: