diff --git a/zabbix-templates/nextcloud-zabbix-template.json b/zabbix-templates/nextcloud-zabbix-template.json
index 8d3de6d..cb0b8d8 100644
--- a/zabbix-templates/nextcloud-zabbix-template.json
+++ b/zabbix-templates/nextcloud-zabbix-template.json
@@ -27,78 +27,6 @@
                 ],
                 "items": [
                     {
-                        "uuid": "ca01b1ae4af04990b8ddcbb06482e5f3",
-                        "name": "User Agent - Chrome browser",
-                        "type": "ZABBIX_ACTIVE",
-                        "key": "apache2_user_agent_metric[Chrome_browser]",
-                        "delay": "1d",
-                        "description": "User Agent - Chrome browser - Last 24h"
-                    },
-                    {
-                        "uuid": "579e468d8ea74a05be501afefc0573bc",
-                        "name": "User Agent - Desktop Client Linux",
-                        "type": "ZABBIX_ACTIVE",
-                        "key": "apache2_user_agent_metric[Desktop_Client_Linux]",
-                        "delay": "1d",
-                        "description": "User Agent - Desktop Client Linux - Last 24h"
-                    },
-                    {
-                        "uuid": "87ac9ddd75f24d209d631ce1226402ea",
-                        "name": "User Agent - Desktop Client Mac",
-                        "type": "ZABBIX_ACTIVE",
-                        "key": "apache2_user_agent_metric[Desktop_Client_Mac]",
-                        "delay": "1d",
-                        "description": "User Agent - Desktop Client Mac - Last 24h"
-                    },
-                    {
-                        "uuid": "455b5838ca7248c98779e122232ec11a",
-                        "name": "User Agent - Desktop Client Windows",
-                        "type": "ZABBIX_ACTIVE",
-                        "key": "apache2_user_agent_metric[Desktop_Client_Windows]",
-                        "delay": "1d",
-                        "description": "User Agent - Desktop Client Windows - Last 24h"
-                    },
-                    {
-                        "uuid": "773a49e0bb9a44ee920510b4a73449d7",
-                        "name": "User Agent - Edge browser",
-                        "type": "ZABBIX_ACTIVE",
-                        "key": "apache2_user_agent_metric[Edge_browser]",
-                        "delay": "1d",
-                        "description": "User Agent - Edge browser - Last 24h"
-                    },
-                    {
-                        "uuid": "a8558f5b2dd64d0bb596c3057ff754ff",
-                        "name": "User Agent - Firefox browser",
-                        "type": "ZABBIX_ACTIVE",
-                        "key": "apache2_user_agent_metric[Firefox_browser]",
-                        "delay": "1d",
-                        "description": "User Agent - Firefox browser - Last 24h"
-                    },
-                    {
-                        "uuid": "62b0b00d10f6478e98775308849f9308",
-                        "name": "User Agent - Nextcloud Talk Android",
-                        "type": "ZABBIX_ACTIVE",
-                        "key": "apache2_user_agent_metric[Nextcloud_Talk_Android]",
-                        "delay": "1d",
-                        "description": "User Agent - Nextcloud Talk Android - Last 24h"
-                    },
-                    {
-                        "uuid": "7f9286df05da4fe6af8b44f247f730db",
-                        "name": "User Agent - Nextcloud Talk iOS",
-                        "type": "ZABBIX_ACTIVE",
-                        "key": "apache2_user_agent_metric[Nextcloud_Talk_iOS]",
-                        "delay": "1d",
-                        "description": "User Agent - Nextcloud Talk iOS - Last 24h"
-                    },
-                    {
-                        "uuid": "83b408e385af4de2982cba7eec7ab210",
-                        "name": "User Agent - Safari browser",
-                        "type": "ZABBIX_ACTIVE",
-                        "key": "apache2_user_agent_metric[Safari_browser]",
-                        "delay": "1d",
-                        "description": "User Agent - Safari browser - Last 24h"
-                    },
-                    {
                         "uuid": "b7dac9facd27414da6710117d61ba6af",
                         "name": "Database Full Version",
                         "type": "ZABBIX_ACTIVE",
@@ -322,8 +250,43 @@
                 ],
                 "discovery_rules": [
                     {
+                        "uuid": "632921baa9b4466abea5285b5113c0ac",
+                        "name": "HTTP Agent Request Count",
+                        "type": "ZABBIX_ACTIVE",
+                        "key": "apache2_user_agent_metric_discovery",
+                        "delay": "1d",
+                        "item_prototypes": [
+                            {
+                                "uuid": "4eba013ed08f4e5a9b71605b316ccf17",
+                                "name": "Number of requests in last natural day - {#NORM_USER_AGENT}",
+                                "type": "ZABBIX_ACTIVE",
+                                "key": "apache2_user_agent_metric[{#NORM_USER_AGENT}]",
+                                "delay": "1d"
+                            }
+                        ],
+                        "graph_prototypes": [
+                            {
+                                "uuid": "a5fc2578020e4b3cbf5a32173d6eb0af",
+                                "name": "Number of requests in last natural day - {#NORM_USER_AGENT}",
+                                "show_work_period": "NO",
+                                "show_triggers": "NO",
+                                "graph_items": [
+                                    {
+                                        "color": "1A7C11",
+                                        "calc_fnc": "ALL",
+                                        "item": {
+                                            "host": "Nextcloud",
+                                            "key": "apache2_user_agent_metric[{#NORM_USER_AGENT}]"
+                                        }
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    {
                         "uuid": "3f2820db83ff4b2fb87013d3d6fcd0be",
                         "name": "Largest database tables",
+                        "type": "ZABBIX_ACTIVE",
                         "key": "db_metric_discovery",
                         "delay": "1h",
                         "item_prototypes": [
@@ -480,22 +443,6 @@
                                     {
                                         "type": "graph",
                                         "y": "8",
-                                        "width": "5",
-                                        "height": "5",
-                                        "fields": [
-                                            {
-                                                "type": "GRAPH",
-                                                "name": "graphid",
-                                                "value": {
-                                                    "host": "Nextcloud",
-                                                    "name": "User Agent - Last Natural Day"
-                                                }
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "type": "graph",
-                                        "y": "13",
                                         "width": "12",
                                         "height": "5",
                                         "fields": [
@@ -510,6 +457,38 @@
                                         ]
                                     },
                                     {
+                                        "type": "graphprototype",
+                                        "name": "HTTP Agents - Number of requests in previous day",
+                                        "y": "13",
+                                        "width": "12",
+                                        "height": "5",
+                                        "fields": [
+                                            {
+                                                "type": "INTEGER",
+                                                "name": "columns",
+                                                "value": "1"
+                                            },
+                                            {
+                                                "type": "ITEM_PROTOTYPE",
+                                                "name": "itemid",
+                                                "value": {
+                                                    "host": "Nextcloud",
+                                                    "key": "apache2_user_agent_metric[{#NORM_USER_AGENT}]"
+                                                }
+                                            },
+                                            {
+                                                "type": "INTEGER",
+                                                "name": "show_legend",
+                                                "value": "0"
+                                            },
+                                            {
+                                                "type": "INTEGER",
+                                                "name": "source_type",
+                                                "value": "3"
+                                            }
+                                        ]
+                                    },
+                                    {
                                         "type": "item",
                                         "name": "Total Number of Files",
                                         "x": "3",
@@ -588,24 +567,6 @@
                                         ]
                                     },
                                     {
-                                        "type": "graph",
-                                        "name": "User Agent - Average per Natural Day",
-                                        "x": "5",
-                                        "y": "8",
-                                        "width": "7",
-                                        "height": "5",
-                                        "fields": [
-                                            {
-                                                "type": "GRAPH",
-                                                "name": "graphid",
-                                                "value": {
-                                                    "host": "Nextcloud",
-                                                    "name": "User Agent - Average per Natural Day"
-                                                }
-                                            }
-                                        ]
-                                    },
-                                    {
                                         "type": "item",
                                         "name": "Total Storage in Data Directory",
                                         "x": "6",
@@ -1479,178 +1440,6 @@
                 ]
             },
             {
-                "uuid": "51561be9b54e4c629a461f851f7e5464",
-                "name": "User Agent - Average per Natural Day",
-                "yaxismax": "0",
-                "show_work_period": "NO",
-                "show_triggers": "NO",
-                "type": "PIE",
-                "show_3d": "YES",
-                "graph_items": [
-                    {
-                        "color": "1A7C11",
-                        "item": {
-                            "host": "Nextcloud",
-                            "key": "apache2_user_agent_metric[Chrome_browser]"
-                        }
-                    },
-                    {
-                        "sortorder": "1",
-                        "color": "274482",
-                        "item": {
-                            "host": "Nextcloud",
-                            "key": "apache2_user_agent_metric[Desktop_Client_Linux]"
-                        }
-                    },
-                    {
-                        "sortorder": "2",
-                        "color": "F63100",
-                        "item": {
-                            "host": "Nextcloud",
-                            "key": "apache2_user_agent_metric[Desktop_Client_Mac]"
-                        }
-                    },
-                    {
-                        "sortorder": "3",
-                        "color": "2774A4",
-                        "item": {
-                            "host": "Nextcloud",
-                            "key": "apache2_user_agent_metric[Desktop_Client_Windows]"
-                        }
-                    },
-                    {
-                        "sortorder": "4",
-                        "color": "A54F10",
-                        "item": {
-                            "host": "Nextcloud",
-                            "key": "apache2_user_agent_metric[Edge_browser]"
-                        }
-                    },
-                    {
-                        "sortorder": "5",
-                        "color": "FC6EA3",
-                        "item": {
-                            "host": "Nextcloud",
-                            "key": "apache2_user_agent_metric[Firefox_browser]"
-                        }
-                    },
-                    {
-                        "sortorder": "6",
-                        "color": "6C59DC",
-                        "item": {
-                            "host": "Nextcloud",
-                            "key": "apache2_user_agent_metric[Nextcloud_Talk_Android]"
-                        }
-                    },
-                    {
-                        "sortorder": "7",
-                        "color": "AC8C14",
-                        "item": {
-                            "host": "Nextcloud",
-                            "key": "apache2_user_agent_metric[Nextcloud_Talk_iOS]"
-                        }
-                    },
-                    {
-                        "sortorder": "8",
-                        "color": "611F27",
-                        "item": {
-                            "host": "Nextcloud",
-                            "key": "apache2_user_agent_metric[Safari_browser]"
-                        }
-                    }
-                ]
-            },
-            {
-                "uuid": "f99a3f8da4d24919a735fab0bdbc7014",
-                "name": "User Agent - Last Natural Day",
-                "yaxismax": "0",
-                "show_work_period": "NO",
-                "show_triggers": "NO",
-                "type": "PIE",
-                "graph_items": [
-                    {
-                        "color": "1A7C11",
-                        "calc_fnc": "LAST",
-                        "item": {
-                            "host": "Nextcloud",
-                            "key": "apache2_user_agent_metric[Chrome_browser]"
-                        }
-                    },
-                    {
-                        "sortorder": "1",
-                        "color": "274482",
-                        "calc_fnc": "LAST",
-                        "item": {
-                            "host": "Nextcloud",
-                            "key": "apache2_user_agent_metric[Desktop_Client_Linux]"
-                        }
-                    },
-                    {
-                        "sortorder": "2",
-                        "color": "F63100",
-                        "calc_fnc": "LAST",
-                        "item": {
-                            "host": "Nextcloud",
-                            "key": "apache2_user_agent_metric[Desktop_Client_Mac]"
-                        }
-                    },
-                    {
-                        "sortorder": "3",
-                        "color": "2774A4",
-                        "calc_fnc": "LAST",
-                        "item": {
-                            "host": "Nextcloud",
-                            "key": "apache2_user_agent_metric[Desktop_Client_Windows]"
-                        }
-                    },
-                    {
-                        "sortorder": "4",
-                        "color": "A54F10",
-                        "calc_fnc": "LAST",
-                        "item": {
-                            "host": "Nextcloud",
-                            "key": "apache2_user_agent_metric[Edge_browser]"
-                        }
-                    },
-                    {
-                        "sortorder": "5",
-                        "color": "FC6EA3",
-                        "calc_fnc": "LAST",
-                        "item": {
-                            "host": "Nextcloud",
-                            "key": "apache2_user_agent_metric[Firefox_browser]"
-                        }
-                    },
-                    {
-                        "sortorder": "6",
-                        "color": "6C59DC",
-                        "calc_fnc": "LAST",
-                        "item": {
-                            "host": "Nextcloud",
-                            "key": "apache2_user_agent_metric[Nextcloud_Talk_Android]"
-                        }
-                    },
-                    {
-                        "sortorder": "7",
-                        "color": "AC8C14",
-                        "calc_fnc": "LAST",
-                        "item": {
-                            "host": "Nextcloud",
-                            "key": "apache2_user_agent_metric[Nextcloud_Talk_iOS]"
-                        }
-                    },
-                    {
-                        "sortorder": "8",
-                        "color": "611F27",
-                        "calc_fnc": "LAST",
-                        "item": {
-                            "host": "Nextcloud",
-                            "key": "apache2_user_agent_metric[Safari_browser]"
-                        }
-                    }
-                ]
-            },
-            {
                 "uuid": "20779ff8bc3346fe8b9af74240d515d3",
                 "name": "Users",
                 "graph_items": [