diff --git a/Applications/template_mqtt_(mosquitto)_broker_monitoring/5.0/template_mqtt_(mosquitto)_broker_monitoring.xml b/Applications/template_mqtt_(mosquitto)_broker_monitoring/5.0/template_mqtt_(mosquitto)_broker_monitoring.xml
index ff790c474..b5a0a1341 100644
--- a/Applications/template_mqtt_(mosquitto)_broker_monitoring/5.0/template_mqtt_(mosquitto)_broker_monitoring.xml
+++ b/Applications/template_mqtt_(mosquitto)_broker_monitoring/5.0/template_mqtt_(mosquitto)_broker_monitoring.xml
@@ -77,4 +77,4 @@ mosquitto\_sub -C 1 -u USERNAME -P PASSWORD -t "$1"
 
 
 
-</description><groups><group><name>Templates</name></group></groups><applications><application><name>MQTT</name></application></applications><items><item><name>MQTT Messages Sent</name><key>mosquitto[/messages/sent]</key><delay>30</delay><value_type>FLOAT</value_type><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Clients Disconnected</name><key>mosquitto[clients/disconnected]</key><delay>30</delay><value_type>FLOAT</value_type><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Clients Expired</name><key>mosquitto[clients/expired]</key><delay>30</delay><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Clients Max</name><key>mosquitto[clients/maximum]</key><delay>30</delay><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Clients Total</name><key>mosquitto[clients/total]</key><delay>30</delay><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT AVG Bytes Received</name><key>mosquitto[load/bytes/received/5min]</key><delay>30</delay><value_type>FLOAT</value_type><units>B</units><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT AVG Bytes Sent</name><key>mosquitto[load/bytes/sent/5min]</key><delay>30</delay><value_type>FLOAT</value_type><units>B</units><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT AVG Messages Received</name><key>mosquitto[load/messages/received/5min]</key><delay>30</delay><value_type>FLOAT</value_type><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT AVG Messages Sent</name><key>mosquitto[load/messages/sent/5min]</key><delay>30</delay><value_type>FLOAT</value_type><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Publish Dropped</name><key>mosquitto[load/publish//dropped/5min]</key><delay>30</delay><value_type>FLOAT</value_type><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Publish Received</name><key>mosquitto[load/publish/received/5min]</key><delay>30</delay><value_type>FLOAT</value_type><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Publish Sent</name><key>mosquitto[load/publish/sent/5min]</key><delay>30</delay><value_type>FLOAT</value_type><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Messages Inflight</name><key>mosquitto[messages/inflight]</key><delay>30</delay><value_type>FLOAT</value_type><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Messages Received</name><key>mosquitto[messages/received]</key><delay>30</delay><value_type>FLOAT</value_type><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Messages Stored</name><key>mosquitto[messages/stored]</key><delay>30</delay><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Count Retained</name><key>mosquitto[retained/messages/count]</key><delay>30</delay><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Count Subscriptions</name><key>mosquitto[subscriptions/count]</key><delay>30</delay><applications><application><name>MQTT</name></application></applications></item></items></template></templates><graphs><graph><name>MQTT Clients</name><graph_items><graph_item><color>CCCC00</color><item><host>App MQTT  Service</host><key>mosquitto[clients/maximum]</key></item></graph_item><graph_item><sortorder>1</sortorder><color>00CC00</color><item><host>App MQTT  Service</host><key>mosquitto[clients/total]</key></item></graph_item><graph_item><sortorder>2</sortorder><color>2774A4</color><item><host>App MQTT  Service</host><key>mosquitto[clients/expired]</key></item></graph_item><graph_item><sortorder>3</sortorder><color>A54F10</color><item><host>App MQTT  Service</host><key>mosquitto[clients/disconnected]</key></item></graph_item></graph_items></graph><graph><name>MQTT Messages Counts</name><graph_items><graph_item><color>00CC00</color><item><host>App MQTT  Service</host><key>mosquitto[/messages/sent]</key></item></graph_item><graph_item><sortorder>1</sortorder><color>A54F10</color><item><host>App MQTT  Service</host><key>mosquitto[messages/inflight]</key></item></graph_item><graph_item><sortorder>2</sortorder><color>3333FF</color><item><host>App MQTT  Service</host><key>mosquitto[messages/stored]</key></item></graph_item></graph_items></graph><graph><name>MQTT Messages Stats</name><graph_items><graph_item><sortorder>1</sortorder><color>CCCC00</color><item><host>App MQTT  Service</host><key>mosquitto[load/messages/received/5min]</key></item></graph_item><graph_item><sortorder>2</sortorder><color>00CC00</color><item><host>App MQTT  Service</host><key>mosquitto[load/messages/sent/5min]</key></item></graph_item></graph_items></graph><graph><name>MQTT Publish Counts</name><graph_items><graph_item><color>DD0000</color><item><host>App MQTT  Service</host><key>mosquitto[load/publish//dropped/5min]</key></item></graph_item><graph_item><sortorder>1</sortorder><color>EEEE00</color><item><host>App MQTT  Service</host><key>mosquitto[load/publish/received/5min]</key></item></graph_item><graph_item><sortorder>2</sortorder><color>00DD00</color><item><host>App MQTT  Service</host><key>mosquitto[load/publish/sent/5min]</key></item></graph_item></graph_items></graph><graph><name>MQTT Traffic  Counts</name><graph_items><graph_item><color>CCCC00</color><item><host>App MQTT  Service</host><key>mosquitto[load/bytes/received/5min]</key></item></graph_item><graph_item><sortorder>1</sortorder><color>00CC00</color><item><host>App MQTT  Service</host><key>mosquitto[load/bytes/sent/5min]</key></item></graph_item></graph_items></graph></graphs></zabbix_export>
+</description><groups><group><name>Templates</name></group></groups><applications><application><name>MQTT</name></application></applications><items><item><name>MQTT Messages Sent</name><key>mosquitto[messages/sent]</key><delay>30</delay><value_type>FLOAT</value_type><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Clients Disconnected</name><key>mosquitto[clients/disconnected]</key><delay>30</delay><value_type>FLOAT</value_type><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Clients Expired</name><key>mosquitto[clients/expired]</key><delay>30</delay><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Clients Max</name><key>mosquitto[clients/maximum]</key><delay>30</delay><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Clients Total</name><key>mosquitto[clients/total]</key><delay>30</delay><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT AVG Bytes Received</name><key>mosquitto[load/bytes/received/5min]</key><delay>30</delay><value_type>FLOAT</value_type><units>B</units><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT AVG Bytes Sent</name><key>mosquitto[load/bytes/sent/5min]</key><delay>30</delay><value_type>FLOAT</value_type><units>B</units><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT AVG Messages Received</name><key>mosquitto[load/messages/received/5min]</key><delay>30</delay><value_type>FLOAT</value_type><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT AVG Messages Sent</name><key>mosquitto[load/messages/sent/5min]</key><delay>30</delay><value_type>FLOAT</value_type><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Publish Dropped</name><key>mosquitto[load/publish//dropped/5min]</key><delay>30</delay><value_type>FLOAT</value_type><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Publish Received</name><key>mosquitto[load/publish/received/5min]</key><delay>30</delay><value_type>FLOAT</value_type><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Publish Sent</name><key>mosquitto[load/publish/sent/5min]</key><delay>30</delay><value_type>FLOAT</value_type><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Messages Inflight</name><key>mosquitto[messages/inflight]</key><delay>30</delay><value_type>FLOAT</value_type><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Messages Received</name><key>mosquitto[messages/received]</key><delay>30</delay><value_type>FLOAT</value_type><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Messages Stored</name><key>mosquitto[messages/stored]</key><delay>30</delay><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Count Retained</name><key>mosquitto[retained/messages/count]</key><delay>30</delay><applications><application><name>MQTT</name></application></applications></item><item><name>MQTT Count Subscriptions</name><key>mosquitto[subscriptions/count]</key><delay>30</delay><applications><application><name>MQTT</name></application></applications></item></items></template></templates><graphs><graph><name>MQTT Clients</name><graph_items><graph_item><color>CCCC00</color><item><host>App MQTT  Service</host><key>mosquitto[clients/maximum]</key></item></graph_item><graph_item><sortorder>1</sortorder><color>00CC00</color><item><host>App MQTT  Service</host><key>mosquitto[clients/total]</key></item></graph_item><graph_item><sortorder>2</sortorder><color>2774A4</color><item><host>App MQTT  Service</host><key>mosquitto[clients/expired]</key></item></graph_item><graph_item><sortorder>3</sortorder><color>A54F10</color><item><host>App MQTT  Service</host><key>mosquitto[clients/disconnected]</key></item></graph_item></graph_items></graph><graph><name>MQTT Messages Counts</name><graph_items><graph_item><color>00CC00</color><item><host>App MQTT  Service</host><key>mosquitto[/messages/sent]</key></item></graph_item><graph_item><sortorder>1</sortorder><color>A54F10</color><item><host>App MQTT  Service</host><key>mosquitto[messages/inflight]</key></item></graph_item><graph_item><sortorder>2</sortorder><color>3333FF</color><item><host>App MQTT  Service</host><key>mosquitto[messages/stored]</key></item></graph_item></graph_items></graph><graph><name>MQTT Messages Stats</name><graph_items><graph_item><sortorder>1</sortorder><color>CCCC00</color><item><host>App MQTT  Service</host><key>mosquitto[load/messages/received/5min]</key></item></graph_item><graph_item><sortorder>2</sortorder><color>00CC00</color><item><host>App MQTT  Service</host><key>mosquitto[load/messages/sent/5min]</key></item></graph_item></graph_items></graph><graph><name>MQTT Publish Counts</name><graph_items><graph_item><color>DD0000</color><item><host>App MQTT  Service</host><key>mosquitto[load/publish//dropped/5min]</key></item></graph_item><graph_item><sortorder>1</sortorder><color>EEEE00</color><item><host>App MQTT  Service</host><key>mosquitto[load/publish/received/5min]</key></item></graph_item><graph_item><sortorder>2</sortorder><color>00DD00</color><item><host>App MQTT  Service</host><key>mosquitto[load/publish/sent/5min]</key></item></graph_item></graph_items></graph><graph><name>MQTT Traffic  Counts</name><graph_items><graph_item><color>CCCC00</color><item><host>App MQTT  Service</host><key>mosquitto[load/bytes/received/5min]</key></item></graph_item><graph_item><sortorder>1</sortorder><color>00CC00</color><item><host>App MQTT  Service</host><key>mosquitto[load/bytes/sent/5min]</key></item></graph_item></graph_items></graph></graphs></zabbix_export>