diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 4a10fb7ac8..15a3c8aa3a 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.773.3-230907
+Version: 7.0NG.773.3-230918
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 9304a38d93..19d297d948 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.773.3-230907"
+pandora_version="7.0NG.773.3-230918"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index f8fdb985c4..5037570912 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1031,7 +1031,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.773.3';
-use constant AGENT_BUILD => '230907';
+use constant AGENT_BUILD => '230918';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index cf506511f5..6677779661 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.773.3
-%define release     230907
+%define release     230918
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec
index 7c7373124e..a75d35cfb9 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.773.3
-%define release     230907
+%define release     230918
 
 Summary:            Pandora FMS Linux agent, binary version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 40ecbc015c..e707ff8128 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.773.3
-%define release     230907
+%define release     230918
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 60dd5f2a43..b271ec08e6 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.773.3"
-PI_BUILD="230907"
+PI_BUILD="230918"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 5ec92eec40..ab92079beb 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{230907}
+{230918}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index c9ada13790..ef38786179 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.773.3 Build 230907")
+#define PANDORA_VERSION ("7.0NG.773.3 Build 230918")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 5c694f8a90..4aef0d0f2a 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Pandora FMS"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.773.3(Build 230907))"
+      VALUE "ProductVersion", "(7.0NG.773.3(Build 230918))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 658070ae58..929a9d30a6 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.773.3-230907
+Version: 7.0NG.773.3-230918
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index ff558a0de4..9326b45e98 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.773.3-230907"
+pandora_version="7.0NG.773.3-230918"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/extras/mr/66.sql b/pandora_console/extras/mr/66.sql
index e0652e13a3..cc37eafd1a 100644
--- a/pandora_console/extras/mr/66.sql
+++ b/pandora_console/extras/mr/66.sql
@@ -1,5 +1,6 @@
 START TRANSACTION;
 
+ALTER TABLE tevent_filter ADD private_filter_user text NULL;
 ALTER TABLE `ttrap` ADD COLUMN `utimestamp` INT UNSIGNED NOT NULL DEFAULT 0;
 
 UPDATE ttrap SET utimestamp=UNIX_TIMESTAMP(timestamp);
@@ -44,6 +45,8 @@ ADD COLUMN `time_init` VARCHAR(45) NULL AFTER `date_init`,
 ADD COLUMN `date_end` VARCHAR(45) NULL AFTER `time_init`,
 ADD COLUMN `time_end` VARCHAR(45) NULL AFTER `date_end`;
 
+UPDATE `tdiscovery_apps` SET `version` = '1.1' WHERE `short_name` = 'pandorafms.vmware';
+
 ALTER TABLE `treport_content`  ADD COLUMN `cat_security_hardening` INT NOT NULL DEFAULT 0;
 ALTER TABLE `treport_content`  ADD COLUMN `ignore_skipped` INT NOT NULL DEFAULT 0;
 ALTER TABLE `treport_content`  ADD COLUMN `status_of_check` TINYTEXT;
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 701ce4894b..de42b8b6c3 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -437,7 +437,7 @@ if ($id_agente) {
         [
             'href'    => 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=alert&id_agente='.$id_agente,
             'content' => html_print_image(
-                'images/alert@svg.svg',
+                'images/add-alert.svg',
                 true,
                 [
                     'title' => __('Alerts'),
diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index 5dc0c78019..fa848c845d 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -811,7 +811,7 @@ foreach ($simple_alerts as $alert) {
             $data[3] .= '<tr class="datos2">';
                 $data[3] .= '<td class="w50p">'.html_print_label_input_block(
                     __('Agent'),
-                    ui_print_truncate_text($alias, 'agent_small', false, true, true, '[&hellip;]')
+                    ui_print_truncate_text($alias, 'agent_medium', false, true, true, '[&hellip;]')
                 ).'</td>';
                 $data[3] .= '<td class="w50p">'.html_print_label_input_block(
                     __('Module'),
diff --git a/pandora_console/godmode/events/event_edit_filter.php b/pandora_console/godmode/events/event_edit_filter.php
index e230055f1e..113c156df3 100644
--- a/pandora_console/godmode/events/event_edit_filter.php
+++ b/pandora_console/godmode/events/event_edit_filter.php
@@ -61,6 +61,9 @@ if ($id) {
     $filter = events_get_event_filter($id);
     $id_group_filter = $filter['id_group_filter'];
     $id_group = $filter['id_group'];
+    // Get owner user private filter.
+    $private_filter = ($filter['private_filter_user'] === null || $filter['private_filter_user'] === '') ? 0 : 1;
+    $private_filter_user = $filter['private_filter_user'];
     $id_name = $filter['id_name'];
     $event_type = $filter['event_type'];
     $severity = explode(',', $filter['severity']);
@@ -113,6 +116,7 @@ if ($id) {
     $server_id = ($filter['server_id'] ?? '');
 } else {
     $id_group = '';
+    $private_filter = 0;
     $id_group_filter = '';
     $id_name = '';
     $event_type = '';
@@ -167,8 +171,8 @@ if ($update || $create) {
     $id_user_ack = get_parameter('id_user_ack', '');
     $owner_user = get_parameter('owner_user', '');
     $group_rep = get_parameter('group_rep', '');
-    $date_from = get_parameter('date_from', '');
-    $date_to = get_parameter('date_to', '');
+    $date_from = get_parameter('date_from', '0000-00-00');
+    $date_to = get_parameter('date_to', '0000-00-00');
     $source = get_parameter('source');
     $id_extra = get_parameter('id_extra');
     $user_comment = get_parameter('user_comment');
@@ -192,6 +196,16 @@ if ($update || $create) {
         $server_id = implode(',', $servers_array);
     }
 
+    // Get private filter from user.
+    $private_filter = get_parameter_switch('private_filter_event', 0);
+    if ((int) $private_filter === 1 && $create) {
+        $private_filter_user = $_SESSION['id_usuario'];
+    } else if ((int) $private_filter === 1 && $update) {
+        $private_filter_user = ($private_filter_user === $_SESSION['id_usuario']) ? $private_filter_user : $_SESSION['id_usuario'];
+    } else if ((int) $private_filter === 0) {
+        $private_filter_user = null;
+    }
+
     $values = [
         'id_name'                 => $id_name,
         'id_group_filter'         => $id_group_filter,
@@ -222,6 +236,7 @@ if ($update || $create) {
         'custom_data'             => $custom_data,
         'custom_data_filter_type' => $custom_data_filter_type,
         'server_id'               => $server_id,
+        'private_filter_user'     => $private_filter_user,
     ];
 
     $severity = explode(',', $severity);
@@ -293,6 +308,17 @@ $table->data[0][0] = html_print_label_input_block(
         false,
         '',
         'w100p'
+    ).html_print_label_input_block(
+        __('Private'),
+        html_print_checkbox_switch(
+            'private_filter_event',
+            $private_filter,
+            $private_filter,
+            true,
+            false,
+            'checked_slide_events(this);',
+            true
+        )
     )
 );
 
diff --git a/pandora_console/godmode/events/event_filter.php b/pandora_console/godmode/events/event_filter.php
index 533bfe1190..c4f1860e6f 100644
--- a/pandora_console/godmode/events/event_filter.php
+++ b/pandora_console/godmode/events/event_filter.php
@@ -133,6 +133,18 @@ $filters = db_get_all_rows_sql($sql);
 
 if ($filters === false) {
     $filters = [];
+} else {
+    foreach ($filters as $key => $filter) {
+        $permission = users_is_admin($config['id_user']);
+        // Validate permission and private filter user.
+        if ($permission || $filter['private_filter_user'] === $config['id_user']) {
+            if ($filter['private_filter_user'] !== null) {
+                $filters[$key]['id_name'] = $filter['id_name'].' (P)';
+            }
+        } else if ($filter['private_filter_user'] !== null) {
+            unset($filters[$key]);
+        }
+    }
 }
 
 $table = new stdClass();
diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 455a4fd7fe..06279cd580 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -1327,36 +1327,58 @@ $class = 'databox filters';
         }
         ?>
 
+<?php
+if (is_metaconsole() === true) {
+    ?>
+        <tr id="row_servers_all"   class="datos">
+            <td class="bolder"><?php echo __('Server'); ?></td>
+            <td  >
         <?php
-        if ($meta) {
-            ?>
+        html_print_select(
+            $servers,
+            'combo_server_all',
+            $server_name,
+            '',
+            __('All nodes'),
+            'all'
+        );
+        ?>
+            </td>
+        </tr>
+    <?php
+}
+?>
+
+    <?php
+    if ($meta) {
+        ?>
                 <tr id="row_multiple_servers"   class="datos">
                     <td class="bolder"><?php echo __('Server'); ?></td>
                     <td  >
-                <?php
-                $server_ids = [];
-                $server_ids[0] = __('Local metaconsole');
-                $get_servers = metaconsole_get_servers();
-                foreach ($get_servers as $key => $server) {
-                    $server_ids[$server['id']] = $server['server_name'];
-                }
+            <?php
+            $server_ids = [];
+            $server_ids[0] = __('Local metaconsole');
+            $get_servers = metaconsole_get_servers();
+            foreach ($get_servers as $key => $server) {
+                $server_ids[$server['id']] = $server['server_name'];
+            }
 
-                html_print_select(
-                    $server_ids,
-                    'server_multiple[]',
-                    $server_multiple,
-                    '',
-                    '',
-                    0,
-                    false,
-                    true
-                );
-                ?>
+            html_print_select(
+                $server_ids,
+                'server_multiple[]',
+                $server_multiple,
+                '',
+                '',
+                0,
+                false,
+                true
+            );
+            ?>
                     </td>
                 </tr>
             <?php
-        }
-        ?>
+    }
+    ?>
 
         <tr id="row_label"   class="datos">
             <td class="bolder">
@@ -6711,6 +6733,7 @@ function chooseType() {
     $("#row_alert_actions").hide();
     $("#row_servers").hide();
     $("#row_servers_all_opt").hide();
+    $("#row_servers_all").hide();
     $("#row_multiple_servers").hide();
     $("#row_sort").hide();
     $("#row_date").hide();
@@ -7278,7 +7301,7 @@ function chooseType() {
 
         case 'group_report':
             $("#row_group").show();
-            $("#row_servers_all_opt").show();
+            $("#row_servers_all").show();
             $("#row_description").show();
             $("#row_historical_db_check").hide();
             break;
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index a2bd8fd6a4..a294a7b939 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -1986,7 +1986,7 @@ switch ($action) {
                             break;
 
                             case 'group_report':
-                                $values['server_name'] = get_parameter('combo_server');
+                                $values['server_name'] = get_parameter('combo_server_all');
                                 $good_format = true;
                             break;
 
@@ -2907,7 +2907,7 @@ switch ($action) {
                             break;
 
                             case 'group_report':
-                                $values['server_name'] = get_parameter('combo_server');
+                                $values['server_name'] = get_parameter('combo_server_all');
                                 $good_format = true;
                             break;
 
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 68f2e1dfe2..6379f86d3a 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -1025,6 +1025,27 @@ $table_font->data[$row][] = html_print_label_input_block(
 );
 $row++;
 
+$table_font->data[$row][] = html_print_label_input_block(
+    __('Truncate agent text at end'),
+    html_print_checkbox_switch(
+        'truncate_agent_at_end',
+        1,
+        $config['truncate_agent_at_end'],
+        true
+    )
+);
+
+$table_font->data[$row][] = html_print_label_input_block(
+    __('Truncate module text at end'),
+    html_print_checkbox_switch(
+        'truncate_module_at_end',
+        1,
+        $config['truncate_module_at_end'],
+        true
+    )
+);
+$row++;
+
 $table_font->data[$row][] = html_print_label_input_block(
     __('Agent size text'),
     html_print_div(
diff --git a/pandora_console/godmode/users/user_management.php b/pandora_console/godmode/users/user_management.php
index 39995d52c2..0675c39be5 100644
--- a/pandora_console/godmode/users/user_management.php
+++ b/pandora_console/godmode/users/user_management.php
@@ -607,16 +607,20 @@ if (is_metaconsole() === true) {
     }
 }
 
+$performance_variables_control = (array) json_decode(io_safe_output($config['performance_variables_control']));
+
 $userManagementTable->rowclass['captions_blocksize_eventfilter'] = 'field_half_width';
 $userManagementTable->rowclass['fields_blocksize_eventfilter'] = 'field_half_width';
 $userManagementTable->data['captions_blocksize_eventfilter'][0] = __('Block size for pagination');
-$userManagementTable->data['fields_blocksize_eventfilter'][0] = html_print_input_text(
-    'block_size',
-    $user_info['block_size'],
-    '',
-    5,
-    5,
-    true
+$userManagementTable->data['fields_blocksize_eventfilter'][0] = html_print_input(
+    [
+        'type'   => 'number',
+        'size'   => 5,
+        'max'    => $performance_variables_control['block_size']->max,
+        'name'   => 'block_size',
+        'value'  => $user_info['block_size'],
+        'return' => true,
+    ]
 );
 
 if (is_metaconsole() === true && empty($user_info['metaconsole_default_event_filter']) !== true) {
diff --git a/pandora_console/images/add-alert.svg b/pandora_console/images/add-alert.svg
new file mode 100755
index 0000000000..3dec357543
--- /dev/null
+++ b/pandora_console/images/add-alert.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Add alert@svg</title>
+    <g id="Add-alert" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M10,18 C10,19.1046875 9.10426763,20 8,20 C6.89573237,20 6,19.1046875 6,18 Z M8,2 C8.47753934,2 8.88669653,2.29621004 9.05726495,2.71662986 C8.40926188,3.26642114 8,4.08541645 8,5 L8.00509269,5.17627279 C8.09633912,6.75108004 9.40231912,8 11,8 L12,8 L12,9 C12,10.2760205 12.7966542,11.3659725 13.9197222,11.7996155 C14.313005,13.7223855 15.173052,14.4998338 15.6924763,15.0633413 C15.9067613,15.2955529 16.001761,15.5739183 16,15.8461538 C15.9964039,16.4375 15.5364053,17 14.8535503,17 L1.14644973,17 C0.46359469,17 0.00395325166,16.4375 -1.59872116e-13,15.8461538 C-0.00176101642,15.5739183 0.0932386904,15.2959135 0.307523743,15.0633413 C0.997521614,14.3147837 2.28858906,13.1887019 2.28858906,9.5 C2.28858906,6.69831731 4.23429734,4.45552885 6.85786067,3.90528846 L6.85786067,3.15384615 C6.85786067,2.51670673 7.36928766,2 8,2 Z M15,0 C15.5522847,-1.01453063e-16 16,0.44771525 16,1 L16,3.999 L19,4 C19.5522847,4 20,4.44771525 20,5 C20,5.55228475 19.5522847,6 19,6 L16,6 L16,9 C16,9.55228475 15.5522847,10 15,10 C14.4477153,10 14,9.55228475 14,9 L14,6 L11,6 C10.4477153,6 10,5.55228475 10,5 C10,4.44771525 10.4477153,4 11,4 L14,4 L14,1 C14,0.44771525 14.4477153,1.01453063e-16 15,0 Z" id="Shape" fill="#3F3F3F"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/include/ajax/alert_list.ajax.php b/pandora_console/include/ajax/alert_list.ajax.php
index 2fbda5d75c..d742f952e8 100644
--- a/pandora_console/include/ajax/alert_list.ajax.php
+++ b/pandora_console/include/ajax/alert_list.ajax.php
@@ -35,7 +35,6 @@ $disable_alert = (bool) get_parameter('disable_alert');
 $enable_alert = (bool) get_parameter('enable_alert');
 $get_actions_module = (bool) get_parameter('get_actions_module');
 $show_update_action_menu = (bool) get_parameter('show_update_action_menu');
-$get_agent_alerts_agent_view = (bool) get_parameter('get_agent_alerts_agent_view');
 $resize_event_week = (bool) get_parameter('resize_event_week');
 $get_agent_alerts_datatable  = (bool) get_parameter('get_agent_alerts_datatable', 0);
 $alert_validate = (bool) get_parameter('alert_validate', false);
@@ -91,270 +90,6 @@ if ($get_agent_alerts_simple) {
 }
 
 
-if ($get_agent_alerts_agent_view) {
-    include_once $config['homedir'].'/include/functions_agents.php';
-    include_once $config['homedir'].'/operation/agentes/alerts_status.functions.php';
-    include_once $config['homedir'].'/include/functions_users.php';
-
-    $agent_a = check_acl($config['id_user'], 0, 'AR');
-    $agent_w = check_acl($config['id_user'], 0, 'AW');
-    $access = ($agent_a == true) ? 'AR' : (($agent_w == true) ? 'AW' : 'AR');
-
-    $free_search_alert = get_parameter('free_search_alert', '');
-    $all_groups = json_decode(io_safe_output(get_parameter('all_groups')));
-    $idAgent = (int) get_parameter('id_agent');
-    $filter = get_parameter('filter', 'all_enabled');
-    $url = 'index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$idAgent;
-
-    $sortField = get_parameter('sort_field');
-    $sort = get_parameter('sort', 'none');
-    $selected = true;
-    $selectModuleUp = false;
-    $selectModuleDown = false;
-    $selectTemplateUp = false;
-    $selectTemplateDown = false;
-    $selectLastFiredUp = false;
-    $selectLastFiredDown = false;
-    switch ($sortField) {
-        case 'module':
-            switch ($sort) {
-                case 'up':
-                    $selectModuleUp = $selected;
-                    $order = [
-                        'field' => 'agent_module_name',
-                        'order' => 'ASC',
-                    ];
-                break;
-
-                case 'down':
-                    $selectModuleDown = $selected;
-                    $order = [
-                        'field' => 'agent_module_name',
-                        'order' => 'DESC',
-                    ];
-                break;
-            }
-        break;
-
-        case 'template':
-            switch ($sort) {
-                case 'up':
-                    $selectTemplateUp = $selected;
-                    $order = [
-                        'field' => 'template_name',
-                        'order' => 'ASC',
-                    ];
-                break;
-
-                case 'down':
-                    $selectTemplateDown = $selected;
-                    $order = [
-                        'field' => 'template_name',
-                        'order' => 'DESC',
-                    ];
-                break;
-            }
-        break;
-
-        case 'last_fired':
-            switch ($sort) {
-                case 'up':
-                    $selectLastFiredUp = $selected;
-                    $order = [
-                        'field' => 'last_fired',
-                        'order' => 'ASC',
-                    ];
-                break;
-
-                case 'down':
-                    $selectLastFiredDown = $selected;
-                    $order = [
-                        'field' => 'last_fired',
-                        'order' => 'DESC',
-                    ];
-                break;
-            }
-        break;
-
-        default:
-            $selectDisabledUp = '';
-            $selectDisabledDown = '';
-            $selectModuleUp = $selected;
-            $selectModuleDown = false;
-            $selectTemplateUp = false;
-            $selectTemplateDown = false;
-            $selectLastFiredUp = false;
-            $selectLastFiredDown = false;
-            $order = [
-                'field' => 'agent_module_name',
-                'order' => 'ASC',
-            ];
-        break;
-    }
-
-    if ($free_search_alert != '') {
-        $whereAlertSimple = 'AND ('.'id_alert_template IN (
-                SELECT id
-                FROM talert_templates
-                WHERE name LIKE "%'.$free_search_alert.'%") OR '.'id_alert_template IN (
-                SELECT id
-                FROM talert_templates
-                WHERE id_alert_action IN (
-                    SELECT id
-                    FROM talert_actions
-                    WHERE name LIKE "%'.$free_search_alert.'%")) OR '.'talert_template_modules.id IN (
-                SELECT id_alert_template_module
-                FROM talert_template_module_actions
-                WHERE id_alert_action IN (
-                    SELECT id
-                    FROM talert_actions
-                    WHERE name LIKE "%'.$free_search_alert.'%")) OR '.'id_agent_module IN (
-                SELECT id_agente_modulo
-                FROM tagente_modulo
-                WHERE nombre LIKE "%'.$free_search_alert.'%") OR '.'id_agent_module IN (
-                SELECT id_agente_modulo
-                FROM tagente_modulo
-                WHERE alias LIKE "%'.$free_search_alert.'%")'.')';
-    } else {
-        $whereAlertSimple = '';
-    }
-
-    // Add checks for user ACL.
-    $groups = users_get_groups($config['id_user'], $access);
-    $id_groups = array_keys($groups);
-
-    if (empty($id_groups)) {
-        $whereAlertSimple .= ' AND (1 = 0) ';
-    } else {
-        $whereAlertSimple .= sprintf(
-            ' AND id_agent_module IN (
-                SELECT tam.id_agente_modulo
-                FROM tagente_modulo tam
-                WHERE tam.id_agente IN (
-                    SELECT
-                        ta.id_agente
-                    FROM
-                        tagente ta
-                    WHERE
-                        ta.id_grupo IN (%s)
-                )
-                OR tam.id_agente IN (
-                    SELECT
-                        DISTINCT(tasg.id_agent)
-                    FROM
-                        tagent_secondary_group tasg
-                    WHERE
-                        tasg.id_group IN (%s)
-                )
-            ) ',
-            implode(',', $id_groups),
-            implode(',', $id_groups)
-        );
-    }
-
-    $alerts = [];
-
-    $filter_alert = [];
-    if ($filter_standby == 'standby_on') {
-        $filter_alert['disabled'] = $filter;
-        $filter_alert['standby'] = '1';
-    } else if ($filter_standby == 'standby_off') {
-        $filter_alert['disabled'] = $filter;
-        $filter_alert['standby'] = '0';
-    } else {
-        $filter_alert['disabled'] = $filter;
-    }
-
-    $options_simple = ['order' => $order];
-
-    $alerts['alerts_simple'] = agents_get_alerts_simple($idAgent, $filter_alert, $options_simple, $whereAlertSimple, false, false, false, false, $strict_user, $tag_filter);
-    $countAlertsSimple = agents_get_alerts_simple($idAgent, $filter_alert, false, $whereAlertSimple, false, false, false, true, $strict_user, $tag_filter);
-
-    // Urls to sort the table.
-    $url_up_module = $url.'&sort_field=module&sort=up';
-    $url_down_module = $url.'&sort_field=module&sort=down';
-    $url_up_template = $url.'&sort_field=template&sort=up';
-    $url_down_template = $url.'&sort_field=template&sort=down';
-    $url_up_lastfired = $url.'&sort_field=last_fired&sort=up';
-    $url_down_lastfired = $url.'&sort_field=last_fired&sort=down';
-
-    $table = new stdClass();
-    $table->width = '100%';
-    $table->class = 'info_table';
-    $table->cellpadding = '0';
-    $table->cellspacing = '0';
-    $table->size = [];
-    $table->head = [];
-    $table->align = [];
-
-    if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
-        $table->size[7] = '5%';
-        if (check_acl_one_of_groups($config['id_user'], $all_groups, 'LW') || check_acl_one_of_groups($config['id_user'], $all_groups, 'LM')) {
-            $table->head[8] = __('Validate');
-            $table->align[8] = 'left';
-            $table->size[8] = '5%';
-        }
-
-        $table->head[0] = "<span title='".__('Policy')."'>".__('P.').'</span>';
-        $table->head[1] = "<span title='".__('Standby')."'>".__('S.').'</span>';
-
-        if (check_acl_one_of_groups($config['id_user'], $all_groups, 'AW') || check_acl_one_of_groups($config['id_user'], $all_groups, 'LM')) {
-            $table->head[2] = "<span title='".__('Force execution')."'>".__('F.').'</span>';
-        }
-
-        $table->head[3] = __('Module');
-        $table->head[4] = __('Template');
-        $table->head[5] = __('Action');
-        $table->head[6] = __('Last fired');
-        $table->head[7] = __('Status');
-
-        $table->align[7] = 'center';
-
-        $table->head[3] .= ui_get_sorting_arrows($url_up_module, $url_down_module, $selectModuleUp, $selectModuleDown);
-        $table->head[4] .= ui_get_sorting_arrows($url_up_template, $url_down_template, $selectTemplateUp, $selectTemplateDown);
-        $table->head[6] .= ui_get_sorting_arrows($url_up_lastfired, $url_down_lastfired, $selectLastFiredUp, $selectLastFiredDown);
-    } else {
-        $table->size[6] = '5%';
-        if (check_acl($config['id_user'], $id_group, 'LW') || check_acl($config['id_user'], $id_group, 'LM')) {
-            $table->head[7] = __('Validate');
-            $table->align[7] = 'left';
-            $table->size[7] = '5%';
-        }
-
-        $table->head[0] = "<span title='".__('Standby')."'>".__('S.').'</span>';
-
-        if (check_acl($config['id_user'], $id_group, 'AW') || check_acl($config['id_user'], $id_group, 'LM')) {
-            $table->head[1] = "<span title='".__('Force execution')."'>".__('F.').'</span>';
-        }
-
-        $table->head[2] = __('Module');
-        $table->head[3] = __('Template');
-        $table->head[4] = __('Action');
-        $table->head[5] = __('Last fired');
-        $table->head[6] = __('Status');
-
-        $table->align[6] = 'center';
-
-        $table->head[2] .= ui_get_sorting_arrows($url_up_module, $url_down_module, $selectModuleUp, $selectModuleDown);
-        $table->head[3] .= ui_get_sorting_arrows($url_up_template, $url_down_template, $selectTemplateUp, $selectTemplateDown);
-        $table->head[5] .= ui_get_sorting_arrows($url_up_lastfired, $url_down_lastfired, $selectLastFiredUp, $selectLastFiredDown);
-    }
-
-    $table->data = [];
-    $rowPair = true;
-    $iterator = 0;
-    foreach ($alerts['alerts_simple'] as $alert) {
-        $row = ui_format_alert_row($alert, false, $url, 'font-size: 9pt;');
-        $table->data[] = $row;
-    }
-
-    if (empty($table->data) === false) {
-        html_print_table($table);
-    } else {
-        ui_print_info_message(['no_close' => true, 'message' => __('No alerts found') ]);
-    }
-}
-
 if ($enable_alert) {
     if (! check_acl($config['id_user'], 0, 'LW')) {
         db_pandora_audit(
@@ -501,7 +236,7 @@ if ($show_update_action_menu) {
             $data .= '<td class="datos">';
             $data .= ui_print_truncate_text(
                 $agent_alias,
-                'agent_small',
+                'agent_medium',
                 false,
                 true,
                 true,
diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index 7ccf17938b..f9bf50b7ae 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -92,6 +92,9 @@ $get_id_source_event = get_parameter('get_id_source_event');
 $node_id = (int) get_parameter('node_id', 0);
 $settings_modal = get_parameter('settings', 0);
 $parameters_modal = get_parameter('parameters', 0);
+// User private filter.
+$current_filter = get_parameter('current_filter', 0);
+$private_filter_event = get_parameter('private_filter_event', 0);
 
 if ($get_comments === true) {
     global $config;
@@ -337,6 +340,14 @@ if ($save_event_filter) {
     $values['custom_data'] = get_parameter('custom_data');
     $values['custom_data_filter_type'] = get_parameter('custom_data_filter_type');
 
+    // Get private filter from user.
+    $private_filter = get_parameter_switch('private_filter_user', 0);
+    if ((int) $private_filter === 1) {
+        $values['private_filter_user'] = $config['id_user'];
+    } else {
+        $values['private_filter_user'] = null;
+    }
+
     if (is_metaconsole() === true) {
         $values['server_id'] = implode(',', get_parameter('server_id'));
     }
@@ -397,6 +408,17 @@ if ($update_event_filter) {
     $values['custom_data'] = get_parameter('custom_data');
     $values['custom_data_filter_type'] = get_parameter('custom_data_filter_type');
 
+    // Get private filter from user.
+    $private_filter = get_parameter('private_filter_user', 0);
+    $user_private_filter = events_get_event_filter($id);
+    if ((int) $private_filter === 1 && $user_private_filter['private_filter_user'] === null) {
+        $values['private_filter_user'] = $config['id_user'];
+    } else if ($private_filter === $user_private_filter['private_filter_user'] && $user_private_filter['private_filter_user'] !== $config['id_user']) {
+        $values['private_filter_user'] = $user_private_filter['private_filter_user'];
+    } else {
+        $values['private_filter_user'] = null;
+    }
+
     if (is_metaconsole() === true) {
         $values['server_id'] = implode(',', get_parameter('server_id'));
     }
@@ -712,8 +734,8 @@ if ($save_filter_modal) {
         $table = new StdClass;
         $table->id = 'save_filter_form';
         $table->width = '100%';
-        $table->cellspacing = 4;
-        $table->cellpadding = 4;
+        $table->cellspacing = 5;
+        $table->cellpadding = 5;
         $table->class = 'databox';
         if (is_metaconsole() === true) {
             $table->class = 'databox filters';
@@ -732,7 +754,7 @@ if ($save_filter_modal) {
             'filter_mode',
             'new',
             __('New filter'),
-            true,
+            ((int) $current_filter === 0) ? true : false,
             true
         );
 
@@ -740,7 +762,7 @@ if ($save_filter_modal) {
             'filter_mode',
             'update',
             __('Update filter'),
-            false,
+            ((int) $current_filter > 0) ? true : false,
             true
         );
 
@@ -755,6 +777,7 @@ if ($save_filter_modal) {
         $table->rowclass[2] = 'flex';
         $table->rowclass[3] = 'flex';
         $table->rowclass[4] = 'flex';
+        $table->rowclass[5] = 'flex';
         $data[0] = '<b>'.__('Filter name').'</b>'.$jump;
         $data[0] .= html_print_input_text('id_name', '', '', 15, 255, true);
         if (is_metaconsole()) {
@@ -801,9 +824,9 @@ if ($save_filter_modal) {
         $data[0] .= html_print_select(
             $_filters_update,
             'overwrite_filter',
+            $current_filter,
             '',
-            '',
-            '',
+            __('None'),
             0,
             true,
             false,
@@ -814,6 +837,31 @@ if ($save_filter_modal) {
         $table->data[] = $data;
         $table->rowclass[] = '';
 
+        $data = [];
+        $table->rowid[4] = 'update_filter_row2';
+
+        $table->data[] = $data;
+        $table->rowclass[] = '';
+
+        // Update user private filter.
+        $data = [];
+        $table->rowid[6] = 'private_filter_event_row1';
+        $data[0] = html_print_label_input_block(
+            __('Private'),
+            html_print_checkbox_switch(
+                'private_filter_event',
+                $private_filter_event,
+                $private_filter_event,
+                true,
+                false,
+                'checked_slide_events(this);',
+                true
+            )
+        );
+
+        $table->data[] = $data;
+        $table->rowclass[] = '';
+
         html_print_table($table);
 
         html_print_div(
@@ -858,10 +906,19 @@ if ($save_filter_modal) {
     ?>
 <script type="text/javascript">
 function show_save_filter() {
-    $('#save_filter_row1').show();
-    $('#save_filter_row2').show();
-    $('#update_filter_row1').hide();
-    $('#button-update_filter').hide();
+
+    if ($('#hidden-id_filter_event').val() == 0) {
+        $('#save_filter_row1').show();
+        $('#save_filter_row2').show();
+        $('#update_filter_row1').hide();
+        $('#button-update_filter').hide();
+    } else {
+        $('#save_filter_row1').hide();
+        $('#save_filter_row2').hide();
+        $('#button-save_filter').hide();
+        $('#update_filter_row1').show();
+        $('#button-update_filter').show();
+    }
     // Filter save mode selector
     $("[name='filter_mode']").click(function() {
         if ($(this).val() == 'new') {
@@ -936,7 +993,8 @@ function save_new_filter() {
             "id_source_event": $("#text-id_source_event").val(),
             "server_id": $("#server_id").val(),
             "custom_data": $("#text-custom_data").val(),
-            "custom_data_filter_type": $("#custom_data_filter_type").val()
+            "custom_data_filter_type": $("#custom_data_filter_type").val(),
+            "private_filter_user": $("#checkbox-private_filter_event").val()
         },
         function (data) {
             $("#info_box").hide();
@@ -1015,7 +1073,8 @@ function save_update_filter() {
         "id_source_event": $("#text-id_source_event").val(),
         "server_id": $("#server_id").val(),
         "custom_data": $("#text-custom_data").val(),
-        "custom_data_filter_type": $("#custom_data_filter_type").val()
+        "custom_data_filter_type": $("#custom_data_filter_type").val(),
+        "private_filter_user": $("#checkbox-private_filter_event").val()
 
         },
         function (data) {
diff --git a/pandora_console/include/ajax/notifications.ajax.php b/pandora_console/include/ajax/notifications.ajax.php
new file mode 100644
index 0000000000..36ea95900d
--- /dev/null
+++ b/pandora_console/include/ajax/notifications.ajax.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Extension to manage a list of gateways and the node address where they should
+ * point to.
+ *
+ * @category   Users
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ * |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ * |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2023 Pandora FMS
+ * Please see https://pandorafms.com/community/ for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
+
+global $config;
+
+// Includes.
+require_once $config['homedir'].'/include/functions_notifications.php';
+
+$change_label = get_parameter('change_label', 0);
+if ($change_label === '1') {
+    $label = get_parameter('label', '');
+    $source = get_parameter('source', 0);
+    $user = get_parameter('user', '');
+    $value = get_parameter('value', 0) ? 1 : 0;
+
+    // Update the label value.
+    ob_clean();
+    $json = json_encode(
+        [
+            'result' => notifications_set_user_label_status(
+                $source,
+                $user,
+                $label,
+                $value
+            ),
+        ]
+    );
+
+    echo $json;
+    return;
+}
diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php
index f6d3767708..a434a30e7f 100644
--- a/pandora_console/include/class/ConsoleSupervisor.php
+++ b/pandora_console/include/class/ConsoleSupervisor.php
@@ -621,7 +621,8 @@ class ConsoleSupervisor
             'small_operation_step_datos_purge' => 'Small Operation Step to purge old data',
             'row_limit_csv'                    => 'Row limit in csv log',
             'limit_parameters_massive'         => 'Limit for bulk operations',
-            'block_size'                       => 'Block size for pagination',
+            'block_size'                       => 'User block size for pagination',
+            'global_block_size'                => 'Global block size for pagination',
             'short_module_graph_data'          => 'Data precision',
             'graph_precision'                  => 'Data precision in graphs',
         ];
@@ -635,8 +636,14 @@ class ConsoleSupervisor
 
             $message = '';
             $limit_value = '';
+            $url = '';
             if ($config[$variable] > $values->max) {
                 $message = 'Check the setting of %s, a value greater than %s is not recommended';
+
+                if ($variable === 'block_size') {
+                    $message .= '. (User: '.$config['id_user'].')';
+                }
+
                 $limit_value = $values->max;
             }
 
@@ -647,32 +654,39 @@ class ConsoleSupervisor
 
             if ($limit_value !== '' && $message !== '') {
                 if (is_metaconsole() === true) {
-                    $this->notify(
-                        [
-                            'type'    => 'NOTIF.VARIABLES.PERFORMANCE.'.$variable,
-                            'title'   => __('Incorrect config value'),
-                            'message' => __(
-                                $message,
-                                $names[$variable],
-                                $limit_value
-                            ),
-                            'url'     => '__url__index.php?sec=advanced&sec2=advanced/metasetup',
-                        ]
-                    );
+                    $url = '__url__index.php?sec=advanced&sec2=advanced/metasetup';
                 } else {
-                    $this->notify(
-                        [
-                            'type'    => 'NOTIF.VARIABLES.PERFORMANCE.'.$variable,
-                            'title'   => __('Incorrect config value'),
-                            'message' => __(
-                                $message,
-                                $names[$variable],
-                                $limit_value
-                            ),
-                            'url'     => '__url__/index.php?sec=general&sec2=godmode/setup/setup',
-                        ]
-                    );
+                    $url = '__url__/index.php?sec=general&sec2=godmode/setup/setup';
                 }
+
+                if ($variable === 'block_size') {
+                    if (is_metaconsole() === true) {
+                        $url = '__url__index.php?sec=gusuarios&sec2=godmode/users/configure_user&edit_user=1&pure=0&id_user='.$config['id_user'];
+                    } else {
+                        $url = '__url__/index.php?sec=gusuarios&sec2=godmode/users/configure_user&edit_user=1&pure=0&id_user='.$config['id_user'];
+                    }
+                }
+
+                if ($variable === 'global_block_size') {
+                    if (is_metaconsole() === true) {
+                        $url = '__url__index.php?sec=advanced&sec2=advanced/metasetup&pure=0&tab=visual';
+                    } else {
+                        $url = '__url__/index.php?sec=gsetup&sec2=godmode/setup/setup&section=vis';
+                    }
+                }
+
+                $this->notify(
+                    [
+                        'type'    => 'NOTIF.VARIABLES.PERFORMANCE.'.$variable,
+                        'title'   => __('Incorrect config value'),
+                        'message' => __(
+                            $message,
+                            $names[$variable],
+                            $limit_value
+                        ),
+                        'url'     => $url,
+                    ]
+                );
             }
         }
 
@@ -703,7 +717,7 @@ class ConsoleSupervisor
         $total_agents = db_get_value('count(*)', 'tagente');
 
         if ($total_agents >= 200) {
-            if ($config['agentaccess'] !== 0) {
+            if ((int) $config['agentaccess'] !== 0) {
                 db_process_sql_update('tconfig', ['value' => 0], ['token' => 'agentaccess']);
                 $this->notify(
                     [
diff --git a/pandora_console/include/class/Diagnostics.class.php b/pandora_console/include/class/Diagnostics.class.php
index 2c00a6b328..7d7532189c 100644
--- a/pandora_console/include/class/Diagnostics.class.php
+++ b/pandora_console/include/class/Diagnostics.class.php
@@ -316,6 +316,8 @@ class Diagnostics extends Wizard
      * Graph of the Free Disk Spool Dir module.
      * Graph of the Free RAM module.
      * Graph of the Queued Modules module.
+     * Graph of the Queued_Alerts.
+     * Graph of the Alert_Server_Status.
      * Graph of the Status module.
      * Graph of the System Load AVG module.
      * Graph of the Execution Time module.
@@ -333,52 +335,66 @@ class Diagnostics extends Wizard
         $result = '';
         if ($agentIdMasterServer !== 0) {
             $agentMonitoring = [
-                'chartAgentsUnknown'    => [
+                'chartAgentsUnknown'     => [
                     'title'      => __(
                         'Graph of the Agents Unknown module.'
                     ),
                     'nameModule' => 'Agents_Unknown',
                     'idAgent'    => $agentIdMasterServer,
                 ],
-                'chartDatabaseMain'     => [
+                'chartDatabaseMain'      => [
                     'title'      => __(
                         'Graph of the Database Maintenance module.'
                     ),
                     'nameModule' => 'Database&#x20;Maintenance',
                     'idAgent'    => $agentIdMasterServer,
                 ],
-                'chartFreeDiskSpoolDir' => [
+                'chartFreeDiskSpoolDir'  => [
                     'title'      => __(
                         'Graph of the Free Disk Spool Dir module.'
                     ),
                     'nameModule' => 'FreeDisk_SpoolDir',
                     'idAgent'    => $agentIdMasterServer,
                 ],
-                'chartFreeRAM'          => [
+                'chartFreeRAM'           => [
                     'title'      => __('Graph of the Free RAM module.'),
                     'nameModule' => 'Free_RAM',
                     'idAgent'    => $agentIdMasterServer,
                 ],
-                'chartQueuedModules'    => [
+                'chartQueuedModules'     => [
                     'title'      => __(
                         'Graph of the Queued Modules module.'
                     ),
                     'nameModule' => 'Queued_Modules',
                     'idAgent'    => $agentIdMasterServer,
                 ],
-                'chartStatus'           => [
+                'chartQueuedAlerts'      => [
+                    'title'      => __(
+                        'Graph of the Queued Alerts total.'
+                    ),
+                    'nameModule' => 'Queued_Alerts',
+                    'idAgent'    => $agentIdMasterServer,
+                ],
+                'chartAlertServerStatus' => [
+                    'title'      => __(
+                        'Graph of the Alert Server Status.'
+                    ),
+                    'nameModule' => 'Alert_Server_Status',
+                    'idAgent'    => $agentIdMasterServer,
+                ],
+                'chartStatus'            => [
                     'title'      => __('Graph of the Status module.'),
                     'nameModule' => 'Status',
                     'idAgent'    => $agentIdMasterServer,
                 ],
-                'chartSystemLoadAVG'    => [
+                'chartSystemLoadAVG'     => [
                     'title'      => __(
                         'Graph of the System Load AVG module.'
                     ),
                     'nameModule' => 'System_Load_AVG',
                     'idAgent'    => $agentIdMasterServer,
                 ],
-                'chartExecutionTime'    => [
+                'chartExecutionTime'     => [
                     'title'      => __(
                         'Graph of the Execution Time module.'
                     ),
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index ec8dc69f48..f8bbcad9ec 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -20,7 +20,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC230907';
+$build_version = 'PC230918';
 $pandora_version = 'v7.0NG.773.3';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php
index 1e49315a0a..2a14579bc6 100644
--- a/pandora_console/include/functions_agents.php
+++ b/pandora_console/include/functions_agents.php
@@ -2760,7 +2760,6 @@ function agents_delete_agent($id_agents, $disableACL=false)
         enterprise_include_once('include/functions_agents.php');
         enterprise_hook('agent_delete_from_cache', [$id_agent]);
 
-        
         // Delete agent from fav menu.
         db_process_sql_delete(
             'tfavmenu_user',
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 9bda03f8fd..393c6a2610 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -1288,6 +1288,10 @@ function config_update_config()
                         $error_update[] = __('Default line menu items for the Services');
                     }
 
+                    if (config_update_value('truncate_agent_at_end', get_parameter('truncate_agent_at_end'), true) === false) {
+                        $error_update[] = __('Truncate agent text at end');
+                    }
+
                     if (config_update_value('agent_size_text_small', get_parameter('agent_size_text_small'), true) === false) {
                         $error_update[] = __('Agent size text');
                     }
@@ -1296,6 +1300,10 @@ function config_update_config()
                         $error_update[] = __('Agent size text');
                     }
 
+                    if (config_update_value('truncate_module_at_end', get_parameter('truncate_module_at_end'), true) === false) {
+                        $error_update[] = __('Truncate module text at end');
+                    }
+
                     if (config_update_value('module_size_text_small', get_parameter('module_size_text_small'), true) === false) {
                         $error_update[] = __('Module size text');
                     }
@@ -2565,6 +2573,10 @@ function config_process_config()
                         'max' => 200,
                         'min' => 10,
                     ],
+                    'global_block_size'                => [
+                        'max' => 200,
+                        'min' => 10,
+                    ],
                     'short_module_graph_data'          => [
                         'max' => 20,
                         'min' => 1,
@@ -3526,6 +3538,10 @@ function config_process_config()
         config_update_value('display_item_frame', 1);
     }
 
+    if (!isset($config['truncate_agent_at_end'])) {
+        config_update_value('truncate_agent_at_end', 0);
+    }
+
     if (!isset($config['agent_size_text_small'])) {
         config_update_value('agent_size_text_small', 18);
     }
@@ -3534,6 +3550,10 @@ function config_process_config()
         config_update_value('agent_size_text_medium', 50);
     }
 
+    if (!isset($config['truncate_module_at_end'])) {
+        config_update_value('truncate_module_at_end', 0);
+    }
+
     if (!isset($config['module_size_text_small'])) {
         config_update_value('module_size_text_small', 25);
     }
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 32113327b8..7068d554e6 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -3357,7 +3357,7 @@ function events_get_event_filter_select($manage=true)
     }
 
     $sql = '
-		SELECT id_filter, id_name
+		SELECT id_filter, id_name, private_filter_user
 		FROM tevent_filter
 		WHERE id_group_filter IN (0, '.implode(',', array_keys($user_groups)).')';
 
@@ -3368,7 +3368,20 @@ function events_get_event_filter_select($manage=true)
     } else {
         $result = [];
         foreach ($event_filters as $event_filter) {
-            $result[$event_filter['id_filter']] = $event_filter['id_name'];
+            $permission = users_is_admin($config['id_user']);
+            if ($permission || $event_filter['private_filter_user'] === $config['id_user']) {
+                if ($event_filter['private_filter_user'] !== null) {
+                    $filter_name = $event_filter['id_name'].' (P)';
+                } else {
+                    $filter_name = $event_filter['id_name'];
+                }
+
+                $result[$event_filter['id_filter']] = $filter_name;
+            }
+
+            if ($event_filter['private_filter_user'] === null) {
+                $result[$event_filter['id_filter']] = $event_filter['id_name'];
+            }
         }
     }
 
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 6fa1e2a8d5..bb0fe8fd58 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -1577,10 +1577,16 @@ function graphic_combined_module(
                 $server_name = metaconsole_get_server_by_id($modules[0]['server']);
             }
 
+            if (isset($params_combined['custom_period']) !== false && $params_combined['custom_period'] !== false) {
+                $period = $params_combined['custom_period'];
+            } else {
+                $period = $params['period'];
+            }
+
             if ($params_combined['projection']) {
                 $output_projection = forecast_projection_graph(
                     $module_list[0],
-                    $params['period'],
+                    $period,
                     $params_combined['projection'],
                     false,
                     false,
@@ -5376,9 +5382,11 @@ function graph_so_by_group($id_group, $width=300, $height=200, $recursive=true,
         'SELECT COUNT(id_agente) AS count,
         os.name
         FROM tagente a
+        LEFT JOIN tagent_secondary_group g ON g.id_agent = a.id_agente
         LEFT JOIN tconfig_os os ON a.id_os = os.id_os
-        WHERE a.id_grupo IN (%s)
+        WHERE a.id_grupo IN (%s) OR g.id_group IN (%s)
         GROUP BY os.id_os',
+        implode(',', $id_groups),
         implode(',', $id_groups)
     );
 
@@ -5460,7 +5468,7 @@ function graph_events_agent_by_group($id_group, $width=300, $height=200, $noWate
         }
     }
 
-    $filter_groups = ' AND te.id_grupo IN ('.implode(',', $id_groups).') ';
+    $filter_groups = ' AND (te.id_grupo IN ('.implode(',', $id_groups).') OR g.id_group IN ('.implode(',', $id_groups).'))';
 
     // This will give the distinct id_agente, give the id_grupo that goes
     // with it and then the number of times it occured. GROUP BY statement
@@ -5469,7 +5477,8 @@ function graph_events_agent_by_group($id_group, $width=300, $height=200, $noWate
         'SELECT DISTINCT(id_agente) AS id_agente,
                 COUNT(id_agente) AS count
             FROM tevento te
-            WHERE 1=1  AND estado = 0
+            LEFT JOIN tagent_secondary_group g ON g.id_agent = te.id_agente
+            WHERE 1=1 AND estado = 0
             %s %s
             GROUP BY id_agente
             ORDER BY count DESC LIMIT 8',
diff --git a/pandora_console/include/functions_groups.php b/pandora_console/include/functions_groups.php
index 0be3a8dffe..78b0804c30 100644
--- a/pandora_console/include/functions_groups.php
+++ b/pandora_console/include/functions_groups.php
@@ -2501,7 +2501,9 @@ function groups_get_heat_map_agents(array $id_group, float $width=0, float $heig
         $id_group = [$id_group];
     }
 
-    $sql = 'SELECT * FROM tagente WHERE id_grupo IN('.implode(',', $id_group).')';
+    $sql = 'SELECT * FROM tagente a
+            LEFT JOIN tagent_secondary_group g ON g.id_agent = a.id_agente
+            WHERE a.id_grupo IN ('.implode(',', $id_group).') OR g.id_group IN ('.implode(',', $id_group).')';
 
     $all_agents = db_get_all_rows_sql($sql);
     if (empty($all_agents)) {
@@ -2654,8 +2656,8 @@ function tactical_groups_get_agents_and_monitoring($id_groups, $data='')
 
     if ($data === '') {
         $data = [
-            'total_agents'  => groups_agents_total_counters($id_groups, false)['total'],
-            'monitor_total' => groups_get_total_monitors($id_groups, [], [], false, false, false, false),
+            'total_agents'  => groups_agents_total_counters($id_groups, true)['total'],
+            'monitor_total' => groups_get_total_monitors($id_groups, [], [], false, false, false, true),
         ];
     }
 
@@ -2719,7 +2721,7 @@ function tactical_groups_get_stats_alerts($id_groups, $data='')
     }
 
     $urls = [];
-    $urls['monitor_alerts'] = $config['homeurl'].'index.php?sec=estado&amp;sec2=operation/agentes/alerts_status&amp;refr=60&ag_group='.$id_groups[0];
+    $urls['monitor_alerts'] = $config['homeurl'].'index.php?sec=estado&amp;sec2=operation/agentes/alerts_status&amp;refr=60&disabled=all&ag_group='.$id_groups[0];
     $urls['monitor_alerts_fired'] = $config['homeurl'].'index.php?sec=estado&amp;sec2=operation/agentes/alerts_status&amp;refr=60&disabled=fired&ag_group='.$id_groups[0];
 
     // Alerts table.
@@ -2790,11 +2792,11 @@ function groups_get_stats_modules_status($id_groups, $graph_width=250, $graph_he
 
     if ($data === '') {
         $data = [
-            'monitor_critical' => groups_get_critical_monitors($id_groups, [], [], false, false, false, false),
-            'monitor_warning'  => groups_get_warning_monitors($id_groups, [], [], false, false, false, false),
-            'monitor_ok'       => groups_get_normal_monitors($id_groups, [], [], false, false, false, false),
-            'monitor_unknown'  => groups_get_unknown_monitors($id_groups, [], [], false, false, false, false),
-            'monitor_not_init' => groups_get_not_init_monitors($id_groups, [], [], false, false, false, false),
+            'monitor_critical' => groups_get_critical_monitors($id_groups, [], [], false, false, false, true),
+            'monitor_warning'  => groups_get_warning_monitors($id_groups, [], [], false, false, false, true),
+            'monitor_ok'       => groups_get_normal_monitors($id_groups, [], [], false, false, false, true),
+            'monitor_unknown'  => groups_get_unknown_monitors($id_groups, [], [], false, false, false, true),
+            'monitor_not_init' => groups_get_not_init_monitors($id_groups, [], [], false, false, false, true),
         ];
     }
 
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 3d8eb231b9..cd4a00bf4d 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -3303,7 +3303,7 @@ function html_print_input_image($name, $src, $value, $style='', $return=false, $
 
     // If metaconsole is activated and image doesn't exists try to search on normal console.
     if (is_metaconsole() === true) {
-        if (false === @file_get_contents($src, 0, null, 0, 1)) {
+        if ($src !== null && false === @file_get_contents($src, 0, null, 0, 1)) {
             $src = '../../'.$src;
         }
     }
@@ -7266,6 +7266,8 @@ function html_print_select_date_range(
         $date_init = date('Y/m/d', strtotime($date_end.' -1 days'));
     }
 
+    $date_init = date('Y/m/d', strtotime($date_init));
+
     if ($time_init === '') {
         $time_init = date('H:i:s');
     }
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index fe47857e33..e82fca400b 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -701,6 +701,7 @@ function modules_update_agent_module(
     }
 
     // Disable action requires a special function
+    $result = false;
     if (isset($values['disabled'])) {
         $result_disable = modules_change_disabled($id, $values['disabled']);
 
@@ -709,7 +710,9 @@ function modules_update_agent_module(
         $result_disable = true;
     }
 
-    $result = @db_process_sql_update('tagente_modulo', $values, $where);
+    if (empty($values) === false) {
+        $result = @db_process_sql_update('tagente_modulo', $values, $where);
+    }
 
     if ($result == false) {
         if ($result_disable === ERR_GENERIC) {
diff --git a/pandora_console/include/functions_notifications.php b/pandora_console/include/functions_notifications.php
index 60a8e6bce0..b9393ce1c4 100644
--- a/pandora_console/include/functions_notifications.php
+++ b/pandora_console/include/functions_notifications.php
@@ -635,6 +635,12 @@ function notifications_get_user_label_status($source, $user, $label)
         array_keys(users_get_groups($user)),
         array_keys(notifications_get_group_sources_for_select($source['id']))
     );
+
+    // Clean default common groups error for mesagges.
+    if ($common_groups[0] === 0) {
+        unset($common_groups[0]);
+    }
+
     // No group found, return no permissions.
     $value = empty($common_groups) ? false : $source[$label];
     return notifications_build_user_enable_return($value, false);
@@ -760,9 +766,10 @@ function notifications_print_global_source_configuration($source)
     }
 
     // Generate the title.
-    $html_title = "<div class='global-config-notification-title'>";
+    $html_title = '<h2 style="margin-bottom: auto;">'.$source['description'].'</h2>';
+    $html_title .= "<div class='global-config-notification-title'>";
     $html_title .= html_print_switch($switch_values);
-    $html_title .= '<h2>'.$source['description'].'</h2>';
+    $html_title .= '<h2>'.__('Enable user configuration').'</h2>';
     $html_title .= '</div>';
 
     // Generate the html for title.
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 150c91f2c1..eab4e761d3 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -159,7 +159,10 @@ function reporting_make_reporting_data(
     $force_width_chart=null,
     $force_height_chart=null,
     $pdf=false,
-    $from_template=false
+    $from_template=false,
+    $filter_type='',
+    $custom_date_end='',
+    $custom_period=false
 ) {
     global $config;
 
@@ -194,8 +197,7 @@ function reporting_make_reporting_data(
 
     if (empty($contents)) {
         return reporting_check_structure_report($report);
-    }
-
+    };
     $metaconsole_on = is_metaconsole();
     $index_content = 0;
 
@@ -562,7 +564,10 @@ function reporting_make_reporting_data(
                     $type,
                     $force_width_chart,
                     $force_height_chart,
-                    $pdf
+                    $pdf,
+                    $filter_type,
+                    $custom_date_end,
+                    $custom_period
                 );
             break;
 
@@ -6855,7 +6860,10 @@ function reporting_projection_graph(
     $type='dinamic',
     $force_width_chart=null,
     $force_height_chart=null,
-    $pdf=false
+    $pdf=false,
+    $filter_type='',
+    $custom_date_end='',
+    $custom_period=false
 ) {
     global $config;
 
@@ -6921,6 +6929,7 @@ function reporting_projection_graph(
     $return['agent_name_db'] = $agent_name_db;
     $return['agent_name']  = $agent_name;
     $return['module_name'] = $module_name;
+    $return['datetime'] = $report['datetime'];
 
     set_time_limit(500);
 
@@ -6941,8 +6950,24 @@ function reporting_projection_graph(
                 'return_img_base_64' => true,
             ];
 
+            $top_n_value = $content['top_n_value'];
+            if ($filter_type === 'this_week') {
+                $current_date = date('Y/m/d H:i:s');
+                $monday = date('Y/m/d H:i:s', strtotime('last monday'));
+                $sunday = date('Y/m/d H:i:s', strtotime($monday.' +6 days'));
+                $top_n_value = (strtotime($sunday) - strtotime($current_date));
+            } else if ($filter_type === 'this_month') {
+                $current_date = date('Y/m/d H:i:s');
+                $last_of_month = date('Y/m/d', strtotime('last day of this month'));
+                $top_n_value = (strtotime($last_of_month) - strtotime($current_date));
+            } else if ($filter_type === 'chose_range') {
+                $current_date = date('Y/m/d H:i:s');
+                $top_n_value = (strtotime($custom_date_end) - strtotime($current_date));
+            }
+
             $params_combined = [
-                'projection' => $content['top_n_value'],
+                'projection'    => $top_n_value,
+                'custom_period' => $custom_period,
             ];
 
             if ($pdf === true) {
diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php
index dd391d27c2..0715b2f3f2 100644
--- a/pandora_console/include/functions_reporting_html.php
+++ b/pandora_console/include/functions_reporting_html.php
@@ -26,6 +26,7 @@
  * GNU General Public License for more details.
  * ============================================================================
  */
+use PandoraFMS\Enterprise\Metaconsole\Node;
 
 require_once $config['homedir'].'/include/functions.php';
 require_once $config['homedir'].'/include/functions_db.php';
@@ -119,10 +120,15 @@ function reporting_html_header(
 }
 
 
-function html_do_report_info($report)
+function html_do_report_info($report, $custom_date_end=false, $custom_period=false)
 {
     global $config;
 
+    if ($custom_period !== false && $custom_date_end !== false) {
+        $report['datetime'] = strtotime($custom_date_end);
+        $report['period'] = $custom_period;
+    }
+
     if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
         $background_color = '#222';
     } else {
@@ -170,10 +176,10 @@ function html_do_report_info($report)
  *
  * @return array
  */
-function reporting_html_print_report($report, $mini=false, $report_info=1)
+function reporting_html_print_report($report, $mini=false, $report_info=1, $custom_date_end=false, $custom_period=false)
 {
     if ($report_info == 1) {
-        html_do_report_info($report);
+        html_do_report_info($report, $custom_date_end, $custom_period);
     }
 
     foreach ($report['contents'] as $key => $item) {
@@ -226,6 +232,12 @@ function reporting_html_print_report($report, $mini=false, $report_info=1)
             $label = '';
         }
 
+        if ($custom_date_end !== false) {
+            $to = strtotime($custom_date_end);
+        } else {
+            $to = $item['date']['to'];
+        }
+
         reporting_html_header(
             $table,
             $mini,
@@ -234,7 +246,7 @@ function reporting_html_print_report($report, $mini=false, $report_info=1)
             $item['date']['period'],
             $item['date']['date'],
             $item['date']['from'],
-            $item['date']['to'],
+            $to,
             $label
         );
 
@@ -2884,16 +2896,66 @@ function reporting_html_group_report($table, $item, $pdf=0)
     $table->colspan['group_report']['cell'] = 3;
     $table->cellstyle['group_report']['cell'] = 'text-align: center;';
     $metaconsole_connected = false;
-    if (is_metaconsole() === true) {
+    if (is_metaconsole() === true && $item['server_name'] != '0') {
         $connection = metaconsole_get_connection($item['server_name']);
         if (metaconsole_connect($connection) == NOERR) {
             $metaconsole_connected = true;
         }
     }
 
+    $all_group_id = [];
+    $group_events = [];
+    $group_os = [];
+
     if ($item['subtitle'] === 'All') {
+        if (is_metaconsole() === true && $item['server_name'] === 'all' || $item['server_name'] === '0') {
+            $nodes = metaconsole_get_connections();
+            foreach ($nodes as $node) {
+                try {
+                    $nd = new Node($node['id']);
+                    $nd->connect();
+
+                    $all_group_id_node = db_get_all_rows_sql('SELECT id_grupo FROM tgrupo');
+
+                    $group_events_node = db_get_all_rows_sql(
+                        'SELECT COUNT(te.id_evento) as count_events, ta.alias
+                               FROM tevento as te
+                               INNER JOIN tagente as ta ON te.id_agente = ta.id_agente
+                               GROUP BY te.id_agente'
+                    );
+                    $group_os_node = db_get_all_rows_sql(
+                        'SELECT COUNT(os.name) as count_os, os.name as name_os, ta.id_grupo
+                               FROM tconfig_os as os
+                               INNER JOIN tagente as ta ON ta.id_os = os.id_os GROUP by os.name'
+                    );
+
+                    $all_group_id = array_merge($all_group_id, $all_group_id_node);
+                    $group_events = array_merge($group_events, $group_events_node);
+                    $group_os = array_merge($group_os, $group_os_node);
+                } catch (\Exception $e) {
+                    $nd->disconnect();
+                    $modules_regex_node = [];
+                } finally {
+                    $nd->disconnect();
+                }
+            }
+        } else {
+            $all_group_id = db_get_all_rows_sql('SELECT id_grupo FROM tgrupo');
+
+            $group_events = db_get_all_rows_sql(
+                'SELECT COUNT(te.id_evento) as count_events, ta.alias
+                       FROM tevento as te
+                       INNER JOIN tagente as ta ON te.id_agente = ta.id_agente
+                       GROUP BY te.id_agente'
+            );
+            $group_os = db_get_all_rows_sql(
+                'SELECT COUNT(os.name) as count_os, os.name as name_os, ta.id_grupo
+                       FROM tconfig_os as os
+                       INNER JOIN tagente as ta ON ta.id_os = os.id_os GROUP by os.name'
+            );
+        }
+
         $group_id = [];
-        $all_group_id = db_get_all_rows_sql('SELECT id_grupo FROM tgrupo');
 
         foreach ($all_group_id as $group) {
             $group_id[] = $group['id_grupo'];
@@ -2901,61 +2963,113 @@ function reporting_html_group_report($table, $item, $pdf=0)
 
         $description = __('Data view of all groups');
         $icon = '';
-
-        $group_events = db_get_all_rows_sql(
-            'SELECT COUNT(te.id_evento) as count_events, ta.alias
-            FROM tevento as te
-            INNER JOIN tagente as ta ON te.id_agente = ta.id_agente
-            GROUP BY te.id_agente'
-        );
-
-        $group_os = db_get_all_rows_sql(
-            'SELECT COUNT(os.name) as count_os, os.name as name_os, ta.id_grupo
-            FROM tconfig_os as os
-            INNER JOIN tagente as ta ON ta.id_os = os.id_os GROUP by os.name'
-        );
     } else {
         $group_id = db_get_value('id_grupo', 'tgrupo', 'nombre', $item['subtitle']);
-        $description = db_get_value('description', 'tgrupo', 'id_grupo', $group_id);
-        $icon_url = db_get_value('icon', 'tgrupo', 'id_grupo', $group_id);
-        $icon = html_print_image(
-            'images/'.$icon_url,
-            true,
-            [
-                'title' => $item['subtitle'],
-                'class' => 'main_menu_icon invert_filter',
-            ]
-        );
 
-        $childrens = db_get_all_rows_sql('SELECT id_grupo FROM tgrupo WHERE parent = '.$group_id);
-        $total_agents = db_get_all_rows_sql('SELECT COUNT(id_agente) as total FROM tagente where id_grupo = '.$group_id);
+        if (is_metaconsole() === true && $item['server_name'] === 'all' || $item['server_name'] === '0') {
+            $nodes = metaconsole_get_connections();
+            foreach ($nodes as $node) {
+                try {
+                    $nd = new Node($node['id']);
+                    $nd->connect();
 
-        if ($childrens !== false && (int) $total_agents[0]['total'] !== $item['data']['group_stats']['total_agents']) {
-            $array_group_id = [];
-            $array_group_id[] = $group_id;
-            foreach ($childrens as $group) {
-                $array_group_id[] = $group['id_grupo'];
+                    $group_id_node = db_get_value('id_grupo', 'tgrupo', 'nombre', $item['subtitle']);
+                    $description = db_get_value('description', 'tgrupo', 'id_grupo', $group_id_node);
+                    $icon_url = db_get_value('icon', 'tgrupo', 'id_grupo', $group_id_node);
+                    $icon = html_print_image(
+                        'images/'.$icon_url,
+                        true,
+                        [
+                            'title' => $item['subtitle'],
+                            'class' => 'main_menu_icon invert_filter',
+                        ]
+                    );
+
+                    $childrens = db_get_all_rows_sql('SELECT id_grupo FROM tgrupo WHERE parent = '.$group_id_node);
+                    $total_agents = db_get_all_rows_sql('SELECT COUNT(id_agente) as total FROM tagente where id_grupo = '.$group_id_node);
+
+                    if ($childrens !== false && (int) $total_agents[0]['total'] !== $item['data']['group_stats']['total_agents']) {
+                        $array_group_id = [];
+                        $array_group_id[] = $group_id_node;
+                        foreach ($childrens as $group) {
+                            $array_group_id[] = $group['id_grupo'];
+                        }
+
+                        $group_id_node = $array_group_id;
+                        $explode_group_id = implode(',', $group_id_node);
+                    } else {
+                        $explode_group_id = $group_id_node;
+                    }
+
+                    $group_events_node = db_get_all_rows_sql(
+                        'SELECT COUNT(te.id_evento) as count_events, ta.alias
+                        FROM tevento as te
+                        INNER JOIN tagente as ta ON te.id_agente = ta.id_agente WHERE te.id_grupo IN ('.$explode_group_id.')
+                        GROUP BY te.id_agente'
+                    );
+
+                    $group_os_node = db_get_all_rows_sql(
+                        'SELECT COUNT(os.name) as count_os, os.name as name_os, ta.id_grupo
+                        FROM tconfig_os as os
+                        INNER JOIN tagente as ta ON ta.id_os = os.id_os
+                        WHERE ta.id_grupo IN ('.$explode_group_id.') GROUP by os.name'
+                    );
+
+                    if (is_array($group_events_node) === true) {
+                        $group_events = array_merge($group_events, $group_events_node);
+                    }
+
+                    if (is_array($group_os_node) === true) {
+                        $group_os = array_merge($group_os, $group_os_node);
+                    }
+                } catch (\Exception $e) {
+                    $nd->disconnect();
+                } finally {
+                    $nd->disconnect();
+                }
+            }
+        } else {
+            $description = db_get_value('description', 'tgrupo', 'id_grupo', $group_id);
+            $icon_url = db_get_value('icon', 'tgrupo', 'id_grupo', $group_id);
+            $icon = html_print_image(
+                'images/'.$icon_url,
+                true,
+                [
+                    'title' => $item['subtitle'],
+                    'class' => 'main_menu_icon invert_filter',
+                ]
+            );
+
+            $childrens = db_get_all_rows_sql('SELECT id_grupo FROM tgrupo WHERE parent = '.$group_id);
+            $total_agents = db_get_all_rows_sql('SELECT COUNT(id_agente) as total FROM tagente where id_grupo = '.$group_id);
+
+            if ($childrens !== false && (int) $total_agents[0]['total'] !== $item['data']['group_stats']['total_agents']) {
+                $array_group_id = [];
+                $array_group_id[] = $group_id;
+                foreach ($childrens as $group) {
+                    $array_group_id[] = $group['id_grupo'];
+                }
+
+                $group_id = $array_group_id;
+                $explode_group_id = implode(',', $group_id);
+            } else {
+                $explode_group_id = $group_id;
             }
 
-            $group_id = $array_group_id;
-            $explode_group_id = implode(',', $group_id);
-        } else {
-            $explode_group_id = $group_id;
+            $group_events = db_get_all_rows_sql(
+                'SELECT COUNT(te.id_evento) as count_events, ta.alias
+                FROM tevento as te
+                INNER JOIN tagente as ta ON te.id_agente = ta.id_agente WHERE te.id_grupo IN ('.$explode_group_id.')
+                GROUP BY te.id_agente'
+            );
+
+            $group_os = db_get_all_rows_sql(
+                'SELECT COUNT(os.name) as count_os, os.name as name_os, ta.id_grupo
+                FROM tconfig_os as os
+                INNER JOIN tagente as ta ON ta.id_os = os.id_os
+                WHERE ta.id_grupo IN ('.$explode_group_id.') GROUP by os.name'
+            );
         }
-
-        $group_events = db_get_all_rows_sql(
-            'SELECT COUNT(te.id_evento) as count_events, ta.alias
-            FROM tevento as te
-            INNER JOIN tagente as ta ON te.id_agente = ta.id_agente WHERE te.id_grupo IN ('.$explode_group_id.')
-            GROUP BY te.id_agente'
-        );
-
-        $group_os = db_get_all_rows_sql(
-            'SELECT COUNT(os.name) as count_os, os.name as name_os, ta.id_grupo
-            FROM tconfig_os as os
-            INNER JOIN tagente as ta ON ta.id_os = os.id_os
-            WHERE ta.id_grupo IN ('.$explode_group_id.') GROUP by os.name'
-        );
     }
 
     if ($metaconsole_connected === true) {
@@ -3066,8 +3180,10 @@ function reporting_html_group_report($table, $item, $pdf=0)
     $options = [];
     $labels = [];
     foreach ($group_os as $value) {
-        $data[$value['name_os']] = $value['count_os'];
-        $labels[] = io_safe_output($value['name_os']);
+        $data[$value['name_os']] += $value['count_os'];
+        if (array_search($value['name_os'], $labels) === false) {
+            $labels[] = io_safe_output($value['name_os']);
+        }
     }
 
     $options = [
diff --git a/pandora_console/include/functions_servers.php b/pandora_console/include/functions_servers.php
index e4d1f655b0..3a4273efa4 100644
--- a/pandora_console/include/functions_servers.php
+++ b/pandora_console/include/functions_servers.php
@@ -283,6 +283,10 @@ function servers_get_performance($filter=[])
         }
 
         foreach ($counts as $c) {
+            if (empty($c['modules']) === true) {
+                continue;
+            }
+
             switch ($c['server_type']) {
                 case SERVER_TYPE_DATA:
                     $data['total_local_modules'] = $c['modules'];
@@ -292,7 +296,7 @@ function servers_get_performance($filter=[])
                 case SERVER_TYPE_SNMP:
                 case SERVER_TYPE_ENTERPRISE_ICMP:
                 case SERVER_TYPE_ENTERPRISE_SNMP:
-                    $data['total_network_modules'] = $c['modules'];
+                    $data['total_network_modules'] += $c['modules'];
                 break;
 
                 case SERVER_TYPE_PLUGIN:
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index a57a9346b7..3cb52cdbc0 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -99,23 +99,27 @@ function ui_print_truncate_text(
     $forced_title=false
 ) {
     global $config;
-
+    $truncate_at_end = false;
     if (is_string($numChars)) {
         switch ($numChars) {
             case 'agent_small':
                 $numChars = $config['agent_size_text_small'];
+                $truncate_at_end = (bool) $config['truncate_agent_at_end'];
             break;
 
             case 'agent_medium':
                 $numChars = $config['agent_size_text_medium'];
+                $truncate_at_end = (bool) $config['truncate_agent_at_end'];
             break;
 
             case 'module_small':
                 $numChars = $config['module_size_text_small'];
+                $truncate_at_end = (bool) $config['truncate_module_at_end'];
             break;
 
             case 'module_medium':
                 $numChars = $config['module_size_text_medium'];
+                $truncate_at_end = (bool) $config['truncate_module_at_end'];
             break;
 
             case 'description':
@@ -147,27 +151,35 @@ function ui_print_truncate_text(
         // '/2' because [...] is in the middle of the word.
         $half_length = intval(($numChars - 3) / 2);
 
-        // Depending on the strange behavior of mb_strimwidth() itself,
-        // the 3rd parameter is not to be $numChars but the length of
-        // original text (just means 'large enough').
-        $truncateText2 = mb_strimwidth(
-            $text_html_decoded,
-            (mb_strlen($text_html_decoded, 'UTF-8') - $half_length),
-            mb_strlen($text_html_decoded, 'UTF-8'),
-            '',
-            'UTF-8'
-        );
+        if ($truncate_at_end === true) {
+            // Recover the html entities to avoid XSS attacks.
+            $truncateText = ($text_has_entities) ? io_safe_input(substr($text_html_decoded, 0, $numChars)) : substr($text_html_decoded, 0, $numChars);
+            if (strlen($text_html_decoded) > $numChars) {
+                $truncateText .= '...';
+            }
+        } else {
+            // Depending on the strange behavior of mb_strimwidth() itself,
+            // the 3rd parameter is not to be $numChars but the length of
+            // original text (just means 'large enough').
+            $truncateText2 = mb_strimwidth(
+                $text_html_decoded,
+                (mb_strlen($text_html_decoded, 'UTF-8') - $half_length),
+                mb_strlen($text_html_decoded, 'UTF-8'),
+                '',
+                'UTF-8'
+            );
 
-        $truncateText = mb_strimwidth(
-            $text_html_decoded,
-            0,
-            ($numChars - $half_length),
-            '',
-            'UTF-8'
-        );
+            $truncateText = mb_strimwidth(
+                $text_html_decoded,
+                0,
+                ($numChars - $half_length),
+                '',
+                'UTF-8'
+            );
 
-        // Recover the html entities to avoid XSS attacks.
-        $truncateText = ($text_has_entities) ? io_safe_input($truncateText).$suffix.io_safe_input($truncateText2) : $truncateText.$suffix.$truncateText2;
+            // Recover the html entities to avoid XSS attacks.
+            $truncateText = ($text_has_entities) ? io_safe_input($truncateText).$suffix.io_safe_input($truncateText2) : $truncateText.$suffix.$truncateText2;
+        }
 
         if ($showTextInTitle) {
             if ($style === null) {
@@ -1474,32 +1486,34 @@ function ui_format_alert_row(
 
             $actionText .= ui_print_help_tip(__('The default actions will be executed every time that the alert is fired and no other action is executed'), true);
             // Is possible manage actions if have LW permissions in the agent group of the alert module.
-            if (check_acl($config['id_user'], $id_group, 'LM')) {
-                $actionText .= '<a href="index.php?sec=galertas&sec2=godmode/alerts/alert_list&tab=list&delete_action=1&id_alert='.$alert['id'].'&id_agent='.$agente['alias'].'&id_action='.$action['original_id'].'" onClick="if (!confirm(\' '.__('Are you sure you want to delete alert action?').'\')) return false;">'.html_print_image(
-                    'images/delete.svg',
-                    true,
-                    [
-                        'alt'   => __('Delete action'),
-                        'title' => __('Delete action'),
-                        'class' => 'main_menu_icon invert_filter vertical_baseline',
-                    ]
-                ).'</a>';
-            }
+            if (is_metaconsole() === true) {
+                if (check_acl($config['id_user'], $id_group, 'LM')) {
+                    $actionText .= '<a href="index.php?sec=galertas&sec2=godmode/alerts/alert_list&tab=list&delete_action=1&id_alert='.$alert['id'].'&id_agent='.$agente['alias'].'&id_action='.$action['original_id'].'" onClick="if (!confirm(\' '.__('Are you sure you want to delete alert action?').'\')) return false;">'.html_print_image(
+                        'images/delete.svg',
+                        true,
+                        [
+                            'alt'   => __('Delete action'),
+                            'title' => __('Delete action'),
+                            'class' => 'main_menu_icon invert_filter vertical_baseline',
+                        ]
+                    ).'</a>';
+                }
 
-            if (check_acl($config['id_user'], $id_group, 'LW')) {
-                $actionText .= html_print_input_image(
-                    'update_action',
-                    '/images/edit.svg',
-                    1,
-                    'padding:0px;',
-                    true,
-                    [
-                        'title'   => __('Update action'),
-                        'class'   => 'main_menu_icon invert_filter',
-                        'onclick' => 'show_display_update_action(\''.$action['original_id'].'\',\''.$alert['id'].'\',\''.$alert['id_agent_module'].'\',\''.$action['original_id'].'\',\''.$alert['agent_name'].'\')',
-                    ]
-                );
-                $actionText .= html_print_input_hidden('id_agent_module', $alert['id_agent_module'], true);
+                if (check_acl($config['id_user'], $id_group, 'LW')) {
+                    $actionText .= html_print_input_image(
+                        'update_action',
+                        '/images/edit.svg',
+                        1,
+                        'padding:0px;',
+                        true,
+                        [
+                            'title'   => __('Update action'),
+                            'class'   => 'main_menu_icon invert_filter',
+                            'onclick' => 'show_display_update_action(\''.$action['original_id'].'\',\''.$alert['id'].'\',\''.$alert['id_agent_module'].'\',\''.$action['original_id'].'\',\''.$alert['agent_name'].'\')',
+                        ]
+                    );
+                    $actionText .= html_print_input_hidden('id_agent_module', $alert['id_agent_module'], true);
+                }
             }
 
             $actionText .= '<div id="update_action-div-'.$alert['id'].'" class="invisible">';
@@ -1634,7 +1648,7 @@ function ui_format_alert_row(
             $data[$index['actions']] .= '<tr class="datos2">';
                 $data[$index['actions']] .= '<td class="w50p">'.html_print_label_input_block(
                     __('Agent'),
-                    ui_print_truncate_text($agente['alias'], 'agent_small', false, true, true, '[&hellip;]')
+                    ui_print_truncate_text($agente['alias'], 'agent_medium', false, true, true, '[&hellip;]')
                 ).'</td>';
                 $data[$index['actions']] .= '<td class="w50p">'.html_print_label_input_block(
                     __('Module'),
@@ -3913,6 +3927,11 @@ function ui_print_datatable(array $parameters)
         $parameters['toggle_collapsed'] = true;
     }
 
+    $parameters['startDisabled'] = false;
+    if (isset($parameters['start_disabled']) && $parameters['start_disabled'] === true) {
+        $parameters['startDisabled'] = true;
+    }
+
     $columns_tmp = [];
     foreach ($parameters['columns'] as $k_column => $v_column) {
         if (isset($parameters['columns'][$k_column]['text']) === true) {
@@ -4126,7 +4145,7 @@ function ui_print_datatable(array $parameters)
 
     // Base table.
     $table = '<table id="'.$table_id.'" ';
-    $table .= 'class="'.$parameters['class'].'"';
+    $table .= 'class="invisible '.$parameters['class'].'"';
     $table .= 'style="box-sizing: border-box;'.$parameters['style'].'">';
     $table .= '<thead><tr class="datatables_thead_tr">';
 
@@ -4200,13 +4219,19 @@ function ui_print_datatable(array $parameters)
     $info_msg_arr['message'] = $emptyTable;
     $info_msg_arr['div_class'] = 'info_box_container invisible_important datatable-msg-info-'.$table_id;
 
-    $spinner = '<div id="'.$table_id.'-spinner" class="spinner-fixed"><span></span><span></span><span></span><span></span></div>';
+    $info_msg_arr_filter = [];
+    $info_msg_arr_filter['message'] = __('Please apply a filter to display the data.');
+    $info_msg_arr_filter['div_class'] = 'info_box_container invisible_important datatable-msg-info-filter-'.$table_id;
+
+    $spinner = '<div id="'.$table_id.'-spinner" class="invisible spinner-fixed"><span></span><span></span><span></span><span></span></div>';
 
     // TODO This widget should take a return: ui_print_info_message($info_msg_arr, '', true)
     $info_msg = '<div>'.ui_print_info_message($info_msg_arr).'</div>';
 
+    $info_msg_filter = '<div>'.ui_print_info_message($info_msg_arr_filter, true).'</div>';
+
     $err_msg = '<div id="error-'.$table_id.'"></div>';
-    $output = $info_msg.$err_msg.$filter.$extra.$spinner.$table.$js;
+    $output = $info_msg.$info_msg_filter.$err_msg.$filter.$extra.$spinner.$table.$js;
     if (is_ajax() === false) {
         ui_require_css_file('datatables.min', 'include/styles/js/');
         ui_require_css_file('tables');
diff --git a/pandora_console/include/javascript/datatablesFunction.js b/pandora_console/include/javascript/datatablesFunction.js
index 41f0bbf1e2..6c9dc6a3f4 100644
--- a/pandora_console/include/javascript/datatablesFunction.js
+++ b/pandora_console/include/javascript/datatablesFunction.js
@@ -126,6 +126,11 @@ if (typeof dt.ajax_data !== "undefined") {
   ajaxData = dt.ajax_data;
 }
 
+var startDisabled = false;
+if (dt.startDisabled === true) {
+  startDisabled = true;
+}
+
 $(document).ready(function() {
   function checkPages() {
     if (dt_table.page.info().pages > 1) {
@@ -335,7 +340,25 @@ $(document).ready(function() {
   }
 
   $.extend(settings_datatable, ajaxOrData);
-  var dt_table = $(`#${dt.table_id}`).DataTable(settings_datatable);
+
+  var dt_table;
+
+  if (startDisabled === true) {
+    $(`.datatable-msg-info-filter-${dt.id}`)
+      .removeClass("invisible_important")
+      .show();
+
+    $(`div#${dt.id}-spinner`).hide();
+    $(`#${dt.table_id}`).hide();
+
+    $(`#button-form_${dt.table_id}_search_bt`).click(function() {
+      $(`.datatable-msg-info-filter-${dt.id}`).hide();
+      $(`#${dt.table_id}`).show();
+      dt_table = $(`#${dt.table_id}`).DataTable(settings_datatable);
+    });
+  } else {
+    dt_table = $(`#${dt.table_id}`).DataTable(settings_datatable);
+  }
 
   $(`#button-${dt.form_id}_search_bt`).click(function() {
     dt_table.draw().page(0);
diff --git a/pandora_console/include/lib/Group.php b/pandora_console/include/lib/Group.php
index d9b42271f3..630d91d1c2 100644
--- a/pandora_console/include/lib/Group.php
+++ b/pandora_console/include/lib/Group.php
@@ -663,11 +663,14 @@ class Group extends Entity
                         ultimo_contacto_remoto,
                         fired_count
                 FROM tagente t
+                LEFT JOIN tagent_secondary_group g ON g.id_agent = t.id_agente
                 WHERE disabled = 0 AND
                 total_count <> notinit_count AND
-                id_grupo IN (%s)
+                (id_grupo IN (%s) OR id_group IN (%s))
+
                 %s %s',
                 implode(',', $id_groups),
+                implode(',', $id_groups),
                 $order,
                 $pagination
             );
@@ -686,11 +689,13 @@ class Group extends Entity
                         ultimo_contacto_remoto,
                         fired_count
                 FROM tagente t
+                LEFT JOIN tagent_secondary_group g ON g.id_agent = t.id_agente
                 WHERE disabled = 0 AND
                 total_count <> notinit_count AND
-                id_grupo IN (%s)
+                (id_grupo IN (%s) OR id_group IN (%s))
                 %s',
                 implode(',', $id_groups),
+                implode(',', $id_groups),
                 $order,
             );
 
diff --git a/pandora_console/include/styles/js/jquery-ui_custom.css b/pandora_console/include/styles/js/jquery-ui_custom.css
index 947c858025..9ee92c54d3 100644
--- a/pandora_console/include/styles/js/jquery-ui_custom.css
+++ b/pandora_console/include/styles/js/jquery-ui_custom.css
@@ -4,7 +4,6 @@
 
 .ui-dialog .ui-corner-all .ui-widget {
   border-radius: 0;
-  margin: 0;
   padding: 0;
   border: none;
 }
@@ -217,7 +216,7 @@ a.ui-state-default > span:hover {
   color: #000;
 }
 .ui-widget-header {
-  height: 20px !important;
+  height: fit-content !important;
 }
 .ui-dialog .ui-widget-header {
   margin: 3px 3px 0px 3px;
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index d87d959ac5..8d6fa524d4 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -5089,7 +5089,7 @@ div#dialog_messages table th:last-child {
   position: absolute;
   cursor: pointer;
   top: 5px;
-  left: 0;
+  left: 5px;
   right: 0;
   bottom: 0;
   background-color: #ccc;
diff --git a/pandora_console/install.php b/pandora_console/install.php
index f4b21d1ba4..19c37a7d7e 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.773.3';
-            $build = '230907';
+            $build = '230918';
             $banner = "v$version Build $build";
             error_reporting(0);
 
diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index 07974af99e..176ac6bce8 100755
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -349,12 +349,6 @@ if (is_metaconsole() === true) {
     }
 }
 
-
-$alert_action = empty(alerts_get_alert_actions_filter()) === false
-    ? alerts_get_alert_actions_filter()
-    : ['' => __('No actions')];
-
-
 ob_start();
 
 if ($agent_view_page === true) {
@@ -407,7 +401,7 @@ if ($agent_view_page === true) {
         [
             'id'                  => 'alerts_status_datatable',
             'class'               => 'info_table',
-            'style'               => 'width: 99%;',
+            'style'               => 'width: 100%;',
             'columns'             => $columns,
             'column_names'        => $column_names,
             'no_sortable_columns' => $no_sortable_columns,
@@ -439,6 +433,7 @@ if ($agent_view_page === true) {
                     $strict_user
                 ),
             ],
+            'start_disabled'      => true,
         ]
     );
 }
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index d54d70a799..046fbc5222 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -154,7 +154,7 @@ if ($ag_freestring !== '' || $moduletype !== '' || $datatype !== ''
 
 // The execution has not been done manually.
 $userRequest = (bool) get_parameter('uptbutton');
-if ($userRequest === false) {
+if ($userRequest === true) {
     $autosearch = true;
 }
 
@@ -2354,7 +2354,7 @@ if (empty($result) === false) {
         $tablePagination = ui_pagination($count_modules, false, $offset, 0, true, 'offset', false);
     }
 } else {
-    ui_print_info_message(['no_close' => true, 'message' => __('Sorry no search parameters')]);
+    ui_print_info_message(['no_close' => true, 'message' => __('Please apply a filter to display the data')]);
 }
 
 if (is_metaconsole() !== true) {
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index b764dc23bc..059c8f90ec 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -201,6 +201,10 @@ $search_recursive_groups = get_parameter(
     'filter[search_recursive_groups]',
     ($filter['search_recursive_groups'] ?? '')
 );
+$search_recursive_groups = get_parameter(
+    'filter[private_filter_event]',
+    ($filter['private_filter_event'] ?? '')
+);
 $id_group_filter = get_parameter(
     'filter[id_group_filter]',
     ($filter['id_group'] ?? '')
@@ -509,10 +513,22 @@ if (is_ajax() === true) {
 
                         $tmp->evento = str_replace('"', '', io_safe_output($tmp->evento));
                         $event_text = $tmp->evento;
-                        if (strlen($tmp->evento) >= 40) {
-                            $tmp->evento = ui_print_truncate_text(
-                                $tmp->evento,
-                                40,
+
+                        $tmp->evento = ui_print_truncate_text(
+                            $tmp->evento,
+                            $config['item_title_size_text'],
+                            false,
+                            true,
+                            false,
+                            '&hellip;',
+                            true,
+                            true,
+                        );
+
+                        if (empty($tmp->module_name) === false) {
+                            $tmp->module_name = ui_print_truncate_text(
+                                $tmp->module_name,
+                                'module_medium',
                                 false,
                                 true,
                                 false,
@@ -523,19 +539,16 @@ if (is_ajax() === true) {
                         }
 
                         if (empty($tmp->module_name) === false) {
-                            $tmp->module_name = io_safe_output($tmp->module_name);
-                            if (strlen($tmp->module_name) >= 20) {
-                                $tmp->module_name = ui_print_truncate_text(
-                                    $tmp->module_name,
-                                    20,
-                                    false,
-                                    true,
-                                    false,
-                                    '&hellip;',
-                                    true,
-                                    true,
-                                );
-                            }
+                            $tmp->module_name = ui_print_truncate_text(
+                                $tmp->module_name,
+                                'module_medium',
+                                false,
+                                true,
+                                false,
+                                '&hellip;',
+                                true,
+                                true,
+                            );
                         }
 
                         if (empty($tmp->comments) === false) {
@@ -564,19 +577,16 @@ if (is_ajax() === true) {
                             }
                         }
 
-                        $tmp->agent_name = io_safe_output($tmp->agent_name);
-                        if (strlen($tmp->agent_name) >= 10) {
-                            $tmp->agent_name = ui_print_truncate_text(
-                                $tmp->agent_name,
-                                10,
-                                false,
-                                true,
-                                false,
-                                '&hellip;',
-                                true,
-                                true,
-                            );
-                        }
+                        $tmp->agent_name = ui_print_truncate_text(
+                            $tmp->agent_name,
+                            'agent_medium',
+                            false,
+                            true,
+                            false,
+                            '&hellip;',
+                            true,
+                            true,
+                        );
 
                         $tmp->id_extra = io_safe_output($tmp->id_extra);
                         if (strlen($tmp->id_extra) >= 10) {
@@ -944,10 +954,11 @@ if (is_ajax() === true) {
 
                         // Module name.
                         $tmp->id_agentmodule = $tmp->module_name;
-                        if (strlen($tmp->id_agentmodule) >= 10) {
+                        /*
+                            if (strlen($tmp->id_agentmodule) >= 10) {
                             $tmp->id_agentmodule = ui_print_truncate_text(
                                 $tmp->id_agentmodule,
-                                10,
+                                'module_small',
                                 false,
                                 true,
                                 false,
@@ -955,7 +966,7 @@ if (is_ajax() === true) {
                                 true,
                                 true,
                             );
-                        }
+                        }*/
 
                         // Options.
                         // Show more.
@@ -1327,6 +1338,7 @@ if ($loaded_filter !== false && $from_event_graph != 1 && isset($fb64) === false
 
         $filter_only_alert = $filter['filter_only_alert'];
         $search_secondary_groups = ($filter['search_secondary_groups'] ?? 0);
+        $private_filter_event = ($filter['private_filter_user'] ?? 0);
         $search_recursive_groups = ($filter['search_recursive_groups'] ?? 0);
         $id_group_filter = $filter['id_group_filter'];
         $date_from = $filter['date_from'];
@@ -1879,6 +1891,9 @@ if (enterprise_hook(
  * Load filter form.
  */
 
+// User private filter process.
+$inputs[] = html_print_input_hidden('id_filter_event', $load_filter_id, true);
+
 // Group.
 if ($id_group === null) {
     $id_group = 0;
@@ -1912,7 +1927,7 @@ $data = html_print_checkbox_switch(
 
 $in_group = '<div class="display-initial">';
 $in_group .= $data;
-$in_group .= '<label class="vert-align-bottom pdd_r_20px">';
+$in_group .= '<label class="vert-align-bottom pdd_r_15px">';
 $in_group .= __('Group recursion');
 $in_group .= ui_print_help_tip(
     __('WARNING: This could cause a performace impact.'),
@@ -2063,6 +2078,8 @@ $in = '<div class="filter_input"><label>'.__('Severity').'</label>';
 $in .= $data.'</div>';
 $inputs[] = $in;
 
+// User private filter.
+$inputs[] = html_print_input_hidden('private_filter_event', $private_filter_event, true);
 // Trick view in table.
 $inputs[] = '<div class="w100p pdd_t_15px"></div>';
 
@@ -3356,7 +3373,8 @@ $(document).ready( function() {
                     data: {
                         page: 'include/ajax/events',
                         save_filter_modal: 1,
-                        current_filter: $('#latest_filter_id').val()
+                        current_filter: $('#hidden-id_filter_event').val(),
+                        private_filter_event: $('#hidden-private_filter_event').val()
                     },
                     success: function (data){
                         $('#save-modal-filter')
diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php
index 78f9126122..f84ecdb699 100755
--- a/pandora_console/operation/reporting/reporting_viewer.php
+++ b/pandora_console/operation/reporting/reporting_viewer.php
@@ -60,12 +60,29 @@ $datetime_end = strtotime($date_end.' '.$time_end);
 $custom_date = get_parameter('custom_date', 0);
 $date = get_parameter('date', SECONDS_1DAY);
 $date_text = get_parameter('date_text', SECONDS_1DAY);
-if ($custom_date === '1') {
-    if ($datetime_init >= $datetime_end) {
-        $datetime_init = $date_init_less;
-    }
 
-    $period = ($datetime_end - $datetime_init);
+$custom_date_end = '';
+$filter_type = '';
+$custom_period = false;
+if ($custom_date === '1') {
+    if ($date === 'chose_range') {
+        $date_init = get_parameter('date_init', 0);
+        $date_init = explode(' ', $date_init);
+        $date_init = $date_init[0];
+        $date_init .= ' '.get_parameter('time_init', '00:00:00');
+        $custom_date_end = get_parameter('date_end', 0);
+        $custom_date_end .= ' '.get_parameter('time_end', '00:00:00');
+        $date_end = date('Y/m/d H:i:s');
+        $period = (strtotime($date_end) - strtotime($date_init));
+        $custom_period = (strtotime($custom_date_end) - strtotime($date_init));
+        $filter_type = 'chose_range';
+    } else {
+        if ($datetime_init >= $datetime_end) {
+            $datetime_init = $date_init_less;
+        }
+
+        $period = ($datetime_end - $datetime_init);
+    }
 } else if ($custom_date === '2') {
     $date_units = get_parameter('date_units');
     $date_end = date('Y/m/d H:i:s');
@@ -73,16 +90,18 @@ if ($custom_date === '1') {
     $period = (strtotime($date_end) - strtotime($date_start));
 } else if (in_array($date, ['this_week', 'this_month', 'past_week', 'past_month'])) {
     if ($date === 'this_week') {
-        $monday = date('Y/m/d', strtotime('last monday'));
-
-        $sunday = date('Y/m/d', strtotime($monday.' +6 days'));
-        $period = (strtotime($sunday) - strtotime($monday));
-        $date_init = $monday;
-        $date_end = $sunday;
+        // Last monday.
+        $date_init = date('Y/m/d H:i:s', strtotime('last monday'));
+        // $date_end = date('Y/m/d H:i:s', strtotime($date_init.' +6 days'));
+        $date_end = date('Y/m/d H:i:s');
+        $period = (strtotime($date_end) - strtotime($date_init));
+        $filter_type = 'this_week';
     } else if ($date === 'this_month') {
-        $date_end = date('Y/m/d', strtotime('last day of this month'));
+        // $date_end = date('Y/m/d', strtotime('last day of this month'));
+        $date_end = date('Y/m/d H:i:s');
         $first_of_month = date('Y/m/d', strtotime('first day of this month'));
         $period = (strtotime($date_end) - strtotime($first_of_month));
+        $filter_type = 'this_month';
     } else if ($date === 'past_month') {
         $date_end = date('Y/m/d', strtotime('last day of previous month'));
         $first_of_month = date('Y/m/d', strtotime('first day of previous month'));
@@ -197,7 +216,7 @@ if (check_acl_restricted_all($config['id_user'], $report_group, 'RW')) {
 $options['view'] = [
     'active' => true,
     'text'   => '<a href="index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id='.$id_report.'&pure='.$pure.'">'.html_print_image(
-        'images/eye.png',
+        'images/see-details@svg.svg',
         true,
         [
             'title' => __('View report'),
@@ -265,10 +284,8 @@ ui_print_standard_header(
 // ------------------------ INIT FORM -----------------------------------
 $table2 = new stdClass();
 $table2->id = 'controls_table';
-$table2->size[2] = '50%';
-$table2->size[3] = '50%';
-$table2->style[0] = 'text-align:center';
-$table2->style[1] = 'text-align:center';
+$table2->size[2] = '20%';
+$table2->style[3] = 'position:absolute; left: auto';
 $table2->styleTable = 'border:none';
 
 if (defined('METACONSOLE')) {
@@ -353,13 +370,20 @@ $report = reporting_make_reporting_data(
     $date_end,
     $time,
     $period,
-    'dinamic'
+    'dinamic',
+    null,
+    null,
+    false,
+    false,
+    $filter_type,
+    $custom_date_end,
+    $custom_period
 );
 for ($i = 0; $i < count($report['contents']); $i++) {
     $report['contents'][$i]['description'] = str_replace('&#x0d;&#x0a;', '<br/>', $report['contents'][$i]['description']);
 }
 
-reporting_html_print_report($report, false, $config['custom_report_info']);
+reporting_html_print_report($report, false, $config['custom_report_info'], $custom_date_end, $custom_period);
 
 
 echo '<div id="loading" class="center">';
diff --git a/pandora_console/operation/search_agents.getdata.php b/pandora_console/operation/search_agents.getdata.php
index ea63506fa4..bdeea391a1 100644
--- a/pandora_console/operation/search_agents.getdata.php
+++ b/pandora_console/operation/search_agents.getdata.php
@@ -15,6 +15,7 @@ global $config;
 
 enterprise_include_once('include/functions_policies.php');
 require_once $config['homedir'].'/include/functions_users.php';
+require_once $config['homedir'].'/include/functions_reporting.php';
 
 $searchAgents = get_parameter('search_agents', 0);
 $stringSearchSQL = get_parameter('stringSearchSQL');
diff --git a/pandora_console/operation/users/user_edit_notifications.php b/pandora_console/operation/users/user_edit_notifications.php
index 309439dfe7..77ef1caebe 100644
--- a/pandora_console/operation/users/user_edit_notifications.php
+++ b/pandora_console/operation/users/user_edit_notifications.php
@@ -36,33 +36,11 @@ require_once $config['homedir'].'/include/functions_notifications.php';
 $headerTitle = __('User notifications');
 require $config['homedir'].'/operation/users/user_edit_header.php';
 
-if (get_parameter('change_label', 0)) {
-    $label = get_parameter('label', '');
-    $source = get_parameter('source', 0);
-    $user = get_parameter('user', '');
-    $value = get_parameter('value', 0) ? 1 : 0;
-
-    // Update the label value.
-    ob_clean();
-    echo json_encode(
-        [
-            'result' => notifications_set_user_label_status(
-                $source,
-                $user,
-                $label,
-                $value
-            ),
-        ]
-    );
-    return;
-}
-
-
 echo '<div id="user-notifications-wrapper" class="white_box table_div table_three_columns padding-2">
         <div class="table_thead">
             <div class="table_th"></div>
-            <div class="table_th">'.__('Enable').'</div>
-            <div class="table_th">'.__('Also receive an email').'</div>
+            <div class="table_th">'.__('Console notifications').'</div>
+            <div class="table_th">'.__('E-mail notifications').'</div>
         </div>';
 
 $sources = notifications_get_all_sources();
@@ -109,13 +87,12 @@ html_print_input_hidden('id_user', $id);
         event.preventDefault();
         var check = document.getElementById(event.target.id);
         if (check === null) return;
-
         var match = /notifications-user-([0-9]+)-label-(.*)/
             .exec(event.target.id);
-
         jQuery.post ("ajax.php",
             {
-                "page" : "operation/users/user_edit_notifications",
+                //"page" : "operation/users/user_edit_notifications",
+                "page" : 'include/ajax/notifications.ajax',
                 "change_label" : 1,
                 "label" : match[2],
                 "source" : match[1],
@@ -148,4 +125,5 @@ html_print_input_hidden('id_user', $id);
         );
     }
 }());
+
 </script>
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 655b984492..61265bddfa 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.773.3
-%define release     230907
+%define release     230918
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index 3129691ae0..d8e4bf603c 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.773.3
-%define release     230907
+%define release     230918
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 7f1317844f..bcd655e2e2 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.773.3
-%define release     230907
+%define release     230918
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 0e1f7ec9e0..147ff1bb24 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1301,6 +1301,7 @@ CREATE TABLE IF NOT EXISTS `tevent_filter` (
   `custom_data` VARCHAR(500) DEFAULT '',
   `custom_data_filter_type` TINYINT UNSIGNED DEFAULT 0,
   `owner_user` TEXT,
+  `private_filter_user` TEXT,
   PRIMARY KEY  (`id_filter`)
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 1962582965..5409cd3fcb 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -2642,7 +2642,7 @@ SET @short_name = 'pandorafms.vmware';
 SET @name = 'VMware';
 SET @section = 'app';
 SET @description = 'Monitor&#x20;ESXi&#x20;hosts,&#x20;datastores&#x20;and&#x20;VMs&#x20;from&#x20;a&#x20;specific&#x20;datacenter';
-SET @version = '1.0';
+SET @version = '1.1';
 INSERT IGNORE INTO `tdiscovery_apps` (`id_app`, `short_name`, `name`, `section`, `description`, `version`) VALUES ('', @short_name, @name, @section, @description, @version);
 SELECT @id_app := `id_app` FROM `tdiscovery_apps` WHERE `short_name` = @short_name;
 
diff --git a/pandora_console/vendor/composer/platform_check.php b/pandora_console/vendor/composer/platform_check.php
index b168ddd5d9..21111b57c6 100644
--- a/pandora_console/vendor/composer/platform_check.php
+++ b/pandora_console/vendor/composer/platform_check.php
@@ -16,7 +16,32 @@ if ($issues) {
         if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
             fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
         } elseif (!headers_sent()) {
-            echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
+                     require_once __DIR__.'/../../include/functions_ui.php';
+
+            $url = str_replace('/var/www/html/', '', __DIR__);
+            $url = str_replace('/vendor/composer', '', $url);
+
+            echo '<link rel="stylesheet" type="text/css" href="include/styles/pandora.css">';
+            ?>
+
+            <style>
+                body {
+                    display: block;
+                }
+            </style>
+
+            <?php
+
+            echo '<div style="height:100%;min-height: 100%;display:flex;align-items:center;justify-content:center;background: linear-gradient(74deg, #02020255 36%, transparent 36%), url('.$url.'/../images/backgrounds/background_pandora_console_keys.jpg);">';
+            echo '<center><div align="middle" class="license_databox w600px pdd_10px" style="background-color: white;">';
+            echo '<img style="width: 600px" src="images/custom_logo/logo-default-pandorafms.png"><h2> Composer detected issues in your platform:</h2>';
+            echo '<div class="w90p height_100px" style="text-align:left;font-size: larger">';
+            echo sprintf(
+                'PandoraFMS requires PHP 8.0 to work properly and the version %s has been detected. Please update the PHP version of the system. More info %s. The latest version with PHP 7.4 support is PandoraFMS 767 hope LTS.',
+                PHP_VERSION,
+                '<a style="font-size: initial;" target="_blank" href="https://pandorafms.com/manual/en/documentation/07_technical_annexes/18_php_8">here</a>'
+            );
+            echo '</div></div></center></div>';
         }
     }
     trigger_error(
diff --git a/pandora_plugins/PandoraFMS/pandorafms.pl b/pandora_plugins/PandoraFMS/pandorafms.pl
index 8a4d390c7e..5f5e533785 100644
--- a/pandora_plugins/PandoraFMS/pandorafms.pl
+++ b/pandora_plugins/PandoraFMS/pandorafms.pl
@@ -8,6 +8,7 @@ use POSIX qw(strftime);
 use PandoraFMS::DB;
 
 use constant DATASERVER => 0;
+use constant ALERTSERVER => 21;
 use Scalar::Util qw(looks_like_number);
 
 
@@ -159,6 +160,18 @@ sub pandora_self_monitoring ($$) {
 	if (!defined($queued_modules)) {
 		$queued_modules = 0;
 	}
+
+	my $queued_alerts = get_db_value ($dbh, "SELECT count(id) FROM talert_execution_queue");
+	
+	if (!defined($queued_alerts)) {
+		$queued_alerts = 0;
+	}
+
+	my $alert_server_status = get_db_value ($dbh, "SELECT status FROM tserver WHERE server_type = ?", ALERTSERVER);
+	
+	if (!defined($alert_server_status || $alert_server_status eq "") ) {
+		$alert_server_status = 0;
+	}
 	
 	my $dbmaintance;
 	if ($RDBMS eq 'postgresql') {
@@ -193,7 +206,19 @@ sub pandora_self_monitoring ($$) {
 	$xml_output .=" <type>generic_data</type>\n";
 	$xml_output .=" <data>$queued_modules</data>\n";
 	$xml_output .=" </module>\n";
+
+	$xml_output .=" <module>\n";
+	$xml_output .=" <name>Queued_Alerts</name>\n";
+	$xml_output .=" <type>generic_data</type>\n";
+	$xml_output .=" <data>$queued_alerts</data>\n";
+	$xml_output .=" </module>\n";
 	
+	$xml_output .=" <module>\n";
+	$xml_output .=" <name>Alert_Server_Status</name>\n";
+	$xml_output .=" <type>generic_proc</type>\n";
+	$xml_output .=" <data>$alert_server_status</data>\n";
+	$xml_output .=" </module>\n";
+
 	$xml_output .=" <module>\n";
 	$xml_output .=" <name>Agents_Unknown</name>\n";
 	$xml_output .=" <type>generic_data</type>\n";
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 8c9fbb451b..19f2fbb59b 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.773.3-230907
+Version: 7.0NG.773.3-230918
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 630067cc22..39ee7fd114 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.773.3-230907"
+pandora_version="7.0NG.773.3-230918"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 3f4e75f73c..0dc572ebed 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.773.3";
-my $pandora_build = "230907";
+my $pandora_build = "230918";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index cbb4ea851e..f2c7d46143 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -127,6 +127,7 @@ use JSON qw(decode_json encode_json);
 use MIME::Base64;
 use Text::ParseWords;
 use Math::Trig;			# Math functions
+use constant ALERTSERVER => 21;
 
 # Debugging
 #use Data::Dumper;
@@ -5687,7 +5688,7 @@ sub pandora_server_statistics ($$) {
 			$server->{"modules_total"} = get_db_value ($dbh, "SELECT COUNT(tagent_module_inventory.id_agent_module_inventory) FROM tagente, tagent_module_inventory WHERE tagente.disabled=0 AND tagent_module_inventory.id_agente = tagente.id_agente");
 
 			# Calculate lag
-			$lag_row = get_db_single_row ($dbh, "SELECT COUNT(tagent_module_inventory.id_agent_module_inventory) AS module_lag, AVG(UNIX_TIMESTAMP() - utimestamp - tagent_module_inventory.interval) AS lag 
+			$lag_row = get_db_single_row ($dbh, "SELECT COUNT(tagent_module_inventory.id_agent_module_inventory) AS `module_lag`, AVG(UNIX_TIMESTAMP() - utimestamp - tagent_module_inventory.interval) AS `lag` 
 					FROM tagente, tagent_module_inventory
 					WHERE utimestamp > 0
 					AND tagent_module_inventory.id_agente = tagente.id_agente
@@ -5736,8 +5737,8 @@ sub pandora_server_statistics ($$) {
 			if ($server->{"server_type"} != DATASERVER){
 				$lag_row = get_db_single_row (
 					$dbh,
-					"SELECT COUNT(tam.id_agente_modulo) AS module_lag,
-					AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS lag 
+					"SELECT COUNT(tam.id_agente_modulo) AS `module_lag`,
+					AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS `lag` 
 					FROM (
 						SELECT tagente_estado.last_execution_try, tagente_estado.current_interval, tagente_estado.id_agente_modulo
 						FROM tagente_estado
@@ -5762,8 +5763,8 @@ sub pandora_server_statistics ($$) {
 			else {
 				$lag_row = get_db_single_row (
 					$dbh,
-					"SELECT COUNT(tam.id_agente_modulo) AS module_lag,
-					AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS lag
+					"SELECT COUNT(tam.id_agente_modulo) AS `module_lag`,
+					AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS `lag`
 					FROM (
 						SELECT tagente_estado.last_execution_try, tagente_estado.current_interval, tagente_estado.id_agente_modulo
 						FROM tagente_estado
@@ -6132,6 +6133,18 @@ sub pandora_self_monitoring ($$) {
 	if (!defined($queued_modules)) {
 		$queued_modules = 0;
 	}
+
+	my $queued_alerts = get_db_value ($dbh, "SELECT count(id) FROM talert_execution_queue");
+	
+	if (!defined($queued_alerts)) {
+		$queued_alerts = 0;
+	}
+
+	my $alert_server_status = get_db_value ($dbh, "SELECT status FROM tserver WHERE server_type = ?", ALERTSERVER);
+	
+	if (!defined($alert_server_status) || $alert_server_status eq "") {
+		$alert_server_status = 0;
+	}
 	
 	my $pandoradb = 0;
 	my $pandoradb_tstamp = get_db_value ($dbh, "SELECT `value` FROM tconfig WHERE token = 'db_maintance'");
@@ -6158,6 +6171,18 @@ sub pandora_self_monitoring ($$) {
 	$xml_output .=" <type>generic_data</type>";
 	$xml_output .=" <data>$queued_modules</data>";
 	$xml_output .=" </module>";
+
+	$xml_output .=" <module>\n";
+	$xml_output .=" <name>Queued_Alerts</name>\n";
+	$xml_output .=" <type>generic_data</type>\n";
+	$xml_output .=" <data>$queued_alerts</data>\n";
+	$xml_output .=" </module>\n";
+
+	$xml_output .=" <module>\n";
+	$xml_output .=" <name>Alert_Server_Status</name>\n";
+	$xml_output .=" <type>generic_proc</type>\n";
+	$xml_output .=" <data>$alert_server_status</data>\n";
+	$xml_output .=" </module>\n";
 	
 	$xml_output .=" <module>";
 	$xml_output .=" <name>Agents_Unknown</name>";
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index ed6f3abe83..0fe5e566c8 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.773.3";
-my $pandora_build = "230907";
+my $pandora_build = "230918";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 4da9c7472a..4ae90a8296 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.773.3
-%define release     230907
+%define release     230918
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 4cdaa0d4c3..5c1910854b 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.773.3
-%define release     230907
+%define release     230918
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 49f082ea35..21e1e1b47d 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.773.3"
-PI_BUILD="230907"
+PI_BUILD="230918"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/load/pandora_xml_stress.agents b/pandora_server/util/load/pandora_xml_stress.agents
index da718018e0..0b4a54a894 100644
--- a/pandora_server/util/load/pandora_xml_stress.agents
+++ b/pandora_server/util/load/pandora_xml_stress.agents
@@ -147,154 +147,4 @@ be67e5298c830c0bb582556f
 63f5d1404aea4377779edf35
 b03831cce718125cb9612c07
 5465b26fd45d86b059066cc2
-5351de84d2fd638b138ba27b
-6c63000157aed37fa8c0c022
-8d3c18c7fbe518694c6bdb22
-615ec092b6f63bb14a2bb42e
-61de25cf8e12926c28aeffdc
-2b96bc1c8f6f81a5437b61bf
-ba1f4fcf3954e0efe5d68c83
-ee5bd3e1a937b90562677f1d
-0cf18ae18b0c680d00cb4d2e
-abf72b0d66f90bd6e67c43c6
-f263d033bb07e0b8cd405224
-418ddf02720649b40db2dd67
-01d1a735aa980326d385ea65
-0cc3860bb0a3fd5822b25ea4
-b0b89dbebfab05fafd6cf9dd
-2fcbb999444db5c0c77c2ec2
-f49a97b3531b8ab8d487c7a7
-ffb66d5003620e2fa47ef8ea
-04da742ab6c99b5c44f9f0cc
-dc310a9d42d7c367671ffbf9
-b0f5c4ee8d327449ef2103e6
-5bd2ce604ed7c820169f0ac2
-57f874a6e41baa5a1196b15f
-b43142736205ad1011f4a5a6
-50cf8523e5090251516eecb0
-ebad61d47be209696f9d41aa
-66bc5976a98266560d1867ff
-3c37fc452e9ad36cd7adcb1a
-4ac8c3db63a69ce883f3fcf5
-6c89e2bb90b9ab95f4adde3c
-917de5ece0a5ef663a8f44e7
-b50eba76cf29aca3cf696d7e
-74264c913ac1e141db78708a
-2b6c93011f62cffb5c085886
-700617c377952010272b9522
-dac10c8ddf7c45e55d8028af
-053328a6ff4f2773eebe76fe
-2d7390260285c272688ae1e8
-fa30c9ee6fb1e2f00d7ccb77
-0ca6db378a05246f30c8b820
-9ad6f959de166cc1475040ea
-23b4702f4dfb350085e77482
-4198a8ab80780c5d9b0d82d5
-baebd530dfc47ac77ea42d2a
-636d2ab4e018b5542e429f5e
-40ae44193af360eea68b6f0b
-dd47b39e494a62a4f5b6bef8
-240339c9dcd159595c1edbf3
-0f11840efe364ca6bbb17f43
-8522e203fb4b53e2bd6d6f82
-f134d9b501fa40b17993beee
-d0483306f2f972aacfb4fcea
-926ee4e0a80455cfee517f8b
-c188a327bc66df4878cb3e8b
-c874083c1d932bb4ade6d028
-be2271d8da327f97e05c1c60
-9ca7451d3f261682ec717547
-9eb46e2a5fd072c5267d7432
-41e8f3f7733f87e16b773bad
-f642220cd19f84154e4dd972
-fe3d9f6433883332b464b7ca
-3e9648ccf60b1fa712ea8590
-b7da7292e9418889bc957bd7
-fb4a392d386eca19eec9215e
-34188e4a6590877b2dbb67b0
-e233cb364659dea13dee1fd8
-757b8330465df34879414b7d
-5e0f80102fee69d0742934b2
-d72124afc78e9b3f91550497
-21c77bfe67c6e99f73323f42
-afa8ce345db6300882858f93
-886cc8b32ed80f4c69edb990
-64ea275ce73ef4070cefca19
-c676f1ffe5bdce4e1d3643ed
-baca61ab59568605e3ec8899
-1610892c53a071ed02d20c75
-3321fb7111d74e532932d262
-29583747ac9fbf0bf21c1574
-f51210b47a6e847dcfb52f94
-63c95735ba96c65d2d45b23d
-679c4e3acb15ebec6ecc7529
-42da0760b02d50c6587a8c31
-e42de775dcfcc3c950c1cff5
-ae5791cf265badebd39c78d9
-f66c123309525eeb81b47e92
-7cddc2b9ed6b4df83c72fcbe
-e69cc74632fdaa06f76f708a
-7cfd19c2eeaef2c0537332be
-d27cdcea69f4e49fbae06f4d
-bdfaa2ec52319f0e6533e826
-d59452cdfce11e21682a791f
-cbb74f2d35d54557abdbc2da
-369a4e6f128475bc9f87ef42
-90bf992a98d0b768cbc50520
-1fea663421dae7b418b9b15f
-f9fc5505565c43cebc1545f9
-d02a8f77fbb2b7f384a99949
-279ff35e17c7f6b6a043fde7
-9cf7725d3a97d9aa9e529ce6
-1f465b328b349502c0953b2d
-283fad60fa48ea2075a0e516
-ef5d9e841a02665c54d8fa7f
-b6023425cb4a1503726b3135
-7fb8a1a734c24cc22a5c75eb
-da38d78e83c9288e4cd60cca
-2a928a6498ae8e0b29675c25
-d2194ab5b0e48c2c1f213860
-53acafcd86a61ce55688ebef
-65608eeebc7d9fe2912635ed
-fafb0273e3b04deb1edb2628
-baf07d1f28416da065b6771f
-c2ee8e58209102fdd0bb341c
-f8e92e00670f65c29c4617c9
-a83661705134029ae344176d
-fc02c24e172d12a29b17eede
-2632f143ffe3f64e63e4ba32
-847120de4b72f59263d160f1
-5be36ff5b668eb93823974b2
-cdd8fe5081225519b5fc28af
-53569cbaedb9265839290a6c
-decca89ea0e8944fd93fcd24
-4b10511d840b7f5129ed6190
-5c4a1904de5f90f4d5dd749a
-49c47514c3308df82fcd6b79
-15af3e182c00000eea12f8e5
-a9645c4a43ad211d9ae9a406
-dcffa4e5eee8f966b1edcdaf
-75b25f796f1e392f45c3a737
-0ad5f0b96946ebcabd0457e9
-2f9128177cab74e0bad61189
-49ed14b81e0a166ccf335b4a
-dfe100788326c45dfb84579c
-2616f38caef9decae47e5023
-99b2d0eb14ac19d1cfedd86e
-fb1d4c42ea70fad330b5c5ee
-b6c560867faa3b41b1f5d4fa
-1167fb22e86098ef684eb702
-a2e2c2ee8ec87d4e5d59eb22
-b228beac094e16a0fa3cb528
-ea0de9aad68deed0a4df3e71
-e50cb420497d928ef9827800
-3bb39890ca4a6da941e01782
-73391f2914465c3f2335e24a
-f8b2f512cc0cbc024e2cd377
-4f816b0d36c934b44dbd5bc0
-817edf1e2637fef229752a5f
-4466f97959df7247f7410fbe
-cc85c727080e9d6eb75ef513
-7e27f012167ed8bedc4bd635
-98a445ff41a81a0a752aff25
-3b339e213dd613c4efd878c1
\ No newline at end of file
+5351de84d2fd638b138ba27b
\ No newline at end of file
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 119a8d5abc..4f087de961 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -35,7 +35,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.773.3 Build 230907";
+my $version = "7.0NG.773.3 Build 230918";
 
 # Pandora server configuration
 my %conf;
@@ -359,7 +359,12 @@ sub pandora_purgedb ($$$) {
 			log_message ('!', "Cannot execute " . $conf->{'_netflow_nfexpire'} . ", skipping.");
 		}
 		else {
-			`yes 2>/dev/null | $conf->{'_netflow_nfexpire'} -r "$conf->{'_netflow_path'}" -t $conf->{'_netflow_max_lifetime'}d`;
+			# Update stats file with max lifetime.
+			`yes 2>/dev/null | $conf->{'_netflow_nfexpire'} -u "$conf->{'_netflow_path'}" -t $conf->{'_netflow_max_lifetime'}d -w 100`;
+			# Rescan directory.
+			`yes 2>/dev/null | $conf->{'_netflow_nfexpire'} -r "$conf->{'_netflow_path'}"`;
+			# Expire files
+			`yes 2>/dev/null | $conf->{'_netflow_nfexpire'} -e "$conf->{'_netflow_path'}"`;
 		}
 	}
 	else {
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index d1793aaa3b..b841bc79ae 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.773.3 Build 230907";
+my $version = "7.0NG.773.3 Build 230918";
 
 # save program name for logging
 my $progname = basename($0);