diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 7aa0b1dc23..a43b43fbe3 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.762-220616
+Version: 7.0NG.762-220620
 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 da2264d92c..87448e8cd5 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.762-220616"
+pandora_version="7.0NG.762-220620"
 
 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 746683baf2..2076b7052f 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1015,7 +1015,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.762';
-use constant AGENT_BUILD => '220616';
+use constant AGENT_BUILD => '220620';
 
 # 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 d64f371dcd..12daca8f79 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.762
-%define release     220616
+%define release     220620
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 9bfcd6774f..18de41e11f 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.762
-%define release     220616
+%define release     220620
 
 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 e32d36a978..1e83c788ba 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.762"
-PI_BUILD="220616"
+PI_BUILD="220620"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index b50d0d622d..e9027236c7 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{220616}
+{220620}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 06b91d8b58..75735e3070 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.762 Build 220616")
+#define PANDORA_VERSION ("7.0NG.762 Build 220620")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 0610000718..8b8a991284 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.762(Build 220616))"
+      VALUE "ProductVersion", "(7.0NG.762(Build 220620))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 9bc4338c1f..54575236a4 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.762-220616
+Version: 7.0NG.762-220620
 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 57af185b00..9ab336af88 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.762-220616"
+pandora_version="7.0NG.762-220620"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/extras/mr/55.sql b/pandora_console/extras/mr/55.sql
index 882b822f88..b006649dd8 100644
--- a/pandora_console/extras/mr/55.sql
+++ b/pandora_console/extras/mr/55.sql
@@ -38,14 +38,14 @@ ALTER TABLE `tbackup` MODIFY COLUMN `id_user` VARCHAR(255) DEFAULT '';
 ALTER TABLE `tservice` ADD COLUMN `enable_sunburst` tinyint(1) NOT NULL default 0;
 ALTER TABLE `tdashboard` MODIFY `name` TEXT NOT NULL DEFAULT '';
 
-ALTER TABLE `tevent_alert` ADD COLUMN `field1_recovery` TEXT AFTER `recovery_notify`;
-ALTER TABLE `tevent_alert` ADD COLUMN `field4_recovery` TEXT AFTER `field3_recovery`;
-ALTER TABLE `tevent_alert` ADD COLUMN `field5_recovery` TEXT AFTER `field4_recovery`;
-ALTER TABLE `tevent_alert` ADD COLUMN `field6_recovery` TEXT AFTER `field5_recovery`;
-ALTER TABLE `tevent_alert` ADD COLUMN `field7_recovery` TEXT AFTER `field6_recovery`;
-ALTER TABLE `tevent_alert` ADD COLUMN `field8_recovery` TEXT AFTER `field7_recovery`;
-ALTER TABLE `tevent_alert` ADD COLUMN `field9_recovery` TEXT AFTER `field8_recovery`;
-ALTER TABLE `tevent_alert` ADD COLUMN `field10_recovery` TEXT AFTER `field9_recovery`;
+ALTER TABLE `tevent_alert` ADD COLUMN `field1_recovery` text DEFAULT '' AFTER `recovery_notify`;
+ALTER TABLE `tevent_alert` ADD COLUMN `field4_recovery` text DEFAULT '' AFTER `field3_recovery`;
+ALTER TABLE `tevent_alert` ADD COLUMN `field5_recovery` text DEFAULT '' AFTER `field4_recovery`;
+ALTER TABLE `tevent_alert` ADD COLUMN `field6_recovery` text DEFAULT '' AFTER `field5_recovery`;
+ALTER TABLE `tevent_alert` ADD COLUMN `field7_recovery` text DEFAULT '' AFTER `field6_recovery`;
+ALTER TABLE `tevent_alert` ADD COLUMN `field8_recovery` text DEFAULT '' AFTER `field7_recovery`;
+ALTER TABLE `tevent_alert` ADD COLUMN `field9_recovery` text DEFAULT '' AFTER `field8_recovery`;
+ALTER TABLE `tevent_alert` ADD COLUMN `field10_recovery` text DEFAULT '' AFTER `field9_recovery`;
 
 SET @st_oum763 = (SELECT IF(
     (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = 'tautoconfig' AND table_schema = DATABASE() AND column_name = 'disabled') > 0,
diff --git a/pandora_console/godmode/modules/manage_network_components_form_wizard.php b/pandora_console/godmode/modules/manage_network_components_form_wizard.php
index 0fa9d763c5..15b8f2a508 100644
--- a/pandora_console/godmode/modules/manage_network_components_form_wizard.php
+++ b/pandora_console/godmode/modules/manage_network_components_form_wizard.php
@@ -178,6 +178,7 @@ switch ($type) {
     break;
 }
 
+$query_filter = [];
 if (empty($query_filter) === false) {
     $query_filter = json_decode($query_filter, true);
 }
diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php
index 6829d445e1..35fcaf172c 100755
--- a/pandora_console/godmode/snmpconsole/snmp_alert.php
+++ b/pandora_console/godmode/snmpconsole/snmp_alert.php
@@ -1,8 +1,20 @@
 <?php
 /**
- * Pandora FMS - http://pandorafms.com
- * ==================================================
- * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * SNMP Alert Management view.
+ *
+ * @category   Class
+ * @package    Pandora FMS
+ * @subpackage SNMP Alert Management
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2022 Artica Soluciones Tecnologicas
  * Please see http://pandorafms.org 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
@@ -11,10 +23,11 @@
  * 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.
+ * ============================================================================
  */
 
-// Load global vars
-if (! check_acl($config['id_user'], 0, 'LW')) {
+// Load global vars.
+if ((bool) check_acl($config['id_user'], 0, 'LW') === false) {
     db_pandora_audit(
         AUDIT_LOG_ACL_VIOLATION,
         'Trying to access SNMP Alert Management'
@@ -33,19 +46,18 @@ $trap_types = [
     SNMP_TRAP_TYPE_OTHER                  => __('Other'),
 ];
 
-// Form submitted
-// =============
+// Form submitted.
 $update_alert = (bool) get_parameter('update_alert', false);
 $create_alert = (bool) get_parameter('create_alert', false);
 $save_alert = (bool) get_parameter('save_alert', false);
 $modify_alert = (bool) get_parameter('modify_alert', false);
 $delete_alert = (bool) get_parameter('delete_alert', false);
 $multiple_delete = (bool) get_parameter('multiple_delete', false);
-$add_action = (bool) get_parameter('add_alert', 0);
+$add_action = (bool) get_parameter('add_alert', false);
 $delete_action = get_parameter('delete_action', 0);
 $duplicate_alert = get_parameter('duplicate_alert', 0);
 
-if ($add_action) {
+if ($add_action === true) {
     $values['id_alert_snmp'] = (int) get_parameter('id_alert_snmp');
     $values['alert_type'] = (int) get_parameter('alert_type');
     $values[db_escape_key_identifier('al_field1')] = get_parameter('field1_value');
@@ -79,37 +91,41 @@ if ($delete_action) {
 }
 
 if ($update_alert || $modify_alert) {
-    ui_print_page_header(
-        __('SNMP Console').' &raquo; '.__('Update alert'),
-        'images/op_snmp.png',
-        false,
-        'snmp_alert_update_tab',
-        false
-    );
+    $subTitle = __('Update alert');
+    $helpString = 'snmp_alert_update_tab';
 } else if ($create_alert || $save_alert) {
-    ui_print_page_header(
-        __('SNMP Console').' &raquo; '.__('Create alert'),
-        'images/op_snmp.png',
-        false,
-        'snmp_alert_overview_tab',
-        false
-    );
+    $subTitle = __('Create alert');
+    $helpString = 'snmp_alert_overview_tab';
 } else {
-    ui_print_page_header(
-        __('SNMP Console').' &raquo; '.__('Alert overview'),
-        'images/op_snmp.png',
-        false,
-        '',
-        false
-    );
+    $subTitle = __('Alert overview');
+    $helpString = '';
 }
 
+ui_print_standard_header(
+    $subTitle,
+    'images/op_snmp.png',
+    false,
+    $helpString,
+    false,
+    [],
+    [
+        [
+            'link'  => '',
+            'label' => __('Alerts'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('SNMP Console'),
+        ],
+    ]
+);
+
 if ($save_alert || $modify_alert) {
     $id_as = (int) get_parameter('id_alert_snmp', -1);
 
     $source_ip = (string) get_parameter_post('source_ip');
     $alert_type = (int) get_parameter_post('alert_type');
-    // Event, e-mail
+    // Event, e-mail.
     $description = (string) get_parameter_post('description');
     $oid = (string) get_parameter_post('oid');
     $custom_value = (string) get_parameter_post('custom_value');
@@ -269,7 +285,7 @@ if ($save_alert || $modify_alert) {
 
         $result = db_process_sql_insert('talert_snmp', $values);
 
-        if (!$result) {
+        if ((bool) $result === false) {
             db_pandora_audit(
                 AUDIT_LOG_SNMP_MANAGEMENT,
                 'Fail try to create snmp alert'
@@ -278,7 +294,10 @@ if ($save_alert || $modify_alert) {
         } else {
             db_pandora_audit(
                 AUDIT_LOG_SNMP_MANAGEMENT,
-                "Create snmp alert #$result"
+                sprintf(
+                    'Create snmp alert #%s',
+                    $result
+                )
             );
             ui_print_success_message(__('Successfully created'));
         }
@@ -405,24 +424,29 @@ if ($save_alert || $modify_alert) {
 
         $result = db_process_sql($sql);
 
-        if (!$result) {
+        if ((bool) $result === false) {
             db_pandora_audit(
                 AUDIT_LOG_SNMP_MANAGEMENT,
-                "Fail try to update snmp alert #$id_as"
+                sprintf(
+                    'Fail try to update snmp alert #%s',
+                    $id_as
+                )
             );
             ui_print_error_message(__('There was a problem updating the alert'));
         } else {
             db_pandora_audit(
                 AUDIT_LOG_SNMP_MANAGEMENT,
-                "Update snmp alert #$id_as"
+                sprintf(
+                    'Update snmp alert #%s',
+                    $id_as
+                )
             );
             ui_print_success_message(__('Successfully updated'));
         }
     }
 }
 
-// From variable init
-// ==================
+// From variable init.
 if ($update_alert || $duplicate_alert) {
     $id_as = (int) get_parameter('id_alert_snmp', -1);
 
@@ -516,11 +540,11 @@ if ($update_alert || $duplicate_alert) {
         return;
     }
 } else if ($create_alert) {
-    // Variable init
+    // Variable init.
     $id_as = -1;
     $source_ip = '';
     $alert_type = 1;
-    // Event, e-mail
+    // Event, e-mail.
     $description = '';
     $oid = '';
     $custom_value = '';
@@ -595,40 +619,46 @@ if ($update_alert || $duplicate_alert) {
     $group = 0;
 }
 
-// Duplicate alert snmp
+// Duplicate alert snmp.
 if ($duplicate_alert) {
     $values_duplicate = $alert;
-    if (!empty($values_duplicate)) {
+    if (empty($values_duplicate) === false) {
         unset($values_duplicate['id_as']);
         $result = db_process_sql_insert('talert_snmp', $values_duplicate);
 
         if (!$result) {
             db_pandora_audit(
                 AUDIT_LOG_SNMP_MANAGEMENT,
-                "Fail try to duplicate snmp alert #$id_as"
+                sprintf(
+                    'Fail try to duplicate snmp alert #%s',
+                    $id_as
+                )
             );
             ui_print_error_message(__('There was a problem duplicating the alert'));
         } else {
             db_pandora_audit(
                 AUDIT_LOG_SNMP_MANAGEMENT,
-                "Duplicate snmp alert #$id_as"
+                sprintf(
+                    'Duplicate snmp alert #%s',
+                    $id_as
+                )
             );
             ui_print_success_message(__('Successfully Duplicate'));
         }
     } else {
         db_pandora_audit(
             AUDIT_LOG_SNMP_MANAGEMENT,
-            "Fail try to duplicate snmp alert #$id_as"
+            sprintf(
+                'Fail try to duplicate snmp alert #%s',
+                $id_as
+            )
         );
         ui_print_error_message(__('There was a problem duplicating the alert'));
     }
 }
 
-// Header
-// Alert Delete
-// =============
 if ($delete_alert) {
-    // Delete alert
+    // Delete alert.
     $alert_delete = (int) get_parameter_get('delete_alert', 0);
 
     $result = db_process_sql_delete(
@@ -639,13 +669,19 @@ if ($delete_alert) {
     if ($result === false) {
         db_pandora_audit(
             AUDIT_LOG_SNMP_MANAGEMENT,
-            "Fail try to delete snmp alert #$alert_delete"
+            sprintf(
+                'Fail try to delete snmp alert #%s',
+                $alert_delete
+            )
         );
         ui_print_error_message(__('There was a problem deleting the alert'));
     } else {
         db_pandora_audit(
             AUDIT_LOG_SNMP_MANAGEMENT,
-            "Delete snmp alert #$alert_delete"
+            sprintf(
+                'Delete snmp alert #%s',
+                $alert_delete
+            )
         );
         ui_print_success_message(__('Successfully deleted'));
     }
@@ -666,18 +702,24 @@ if ($multiple_delete) {
         if ($result !== false) {
             db_pandora_audit(
                 AUDIT_LOG_SNMP_MANAGEMENT,
-                "Delete snmp alert #$alert_delete"
+                sprintf(
+                    'Delete snmp alert #%s',
+                    $alert_delete
+                )
             );
             $count++;
         } else {
             db_pandora_audit(
                 AUDIT_LOG_SNMP_MANAGEMENT,
-                "Fail try to delete snmp alert #$alert_delete"
+                sprintf(
+                    'Fail try to delete snmp alert #%s',
+                    $alert_delete
+                )
             );
         }
     }
 
-    if ($count == $total) {
+    if ($count === $total) {
         ui_print_success_message(
             __('Successfully deleted alerts (%s / %s)', $count, $total)
         );
@@ -692,7 +734,7 @@ $user_groups = users_get_groups($config['id_user'], 'AR', true);
 $str_user_groups = '';
 $i = 0;
 foreach ($user_groups as $id => $name) {
-    if ($i == 0) {
+    if ($i === 0) {
         $str_user_groups .= $id;
     } else {
         $str_user_groups .= ','.$id;
@@ -701,10 +743,9 @@ foreach ($user_groups as $id => $name) {
     $i++;
 }
 
-// Alert form
+// Alert form.
 if ($create_alert || $update_alert) {
-    // if (isset ($_GET["update_alert"])) {
-    // the update_alert means the form should be displayed. If update_alert > 1 then an existing alert is updated
+    // The update_alert means the form should be displayed. If update_alert > 1 then an existing alert is updated.
     echo '<form name="agente" method="post" action="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert">';
 
     html_print_input_hidden('id_alert_snmp', $id_as);
@@ -717,32 +758,39 @@ if ($create_alert || $update_alert) {
         html_print_input_hidden('modify_alert', 1);
     }
 
-    // SNMP alert filters
+    // SNMP alert filters.
     echo '<table cellpadding="0" cellspacing="0" width="100%" class="databox filter bolder">';
 
-    // Description
-    echo '<tr>'.'<td class="datos" valign="top">'.__('Description').'</td>'.'<td class="datos">';
-            html_print_textarea('description', 3, 2, $description, 'class="w400px"');
-    echo '</td>'.'</tr>';
+    // Description.
+    echo '<tr>';
+    echo '<td class="datos" valign="top">'.__('Description').'</td>';
+    echo '<td class="datos">';
+    html_print_textarea('description', 3, 2, $description, 'class="w400px"');
+    echo '</td>';
+    echo '</tr>';
 
-    // echo '<tr><td class="datos"><b>' . __('Alert filters') . ui_print_help_icon("snmp_alert_filters", true) . '</b></td></tr>';
-    // OID
-    echo '<tr id="tr-oid">'.'<td class="datos2">'.__('Enterprise String').ui_print_help_tip(__('Matches substrings. End the string with $ for exact matches.'), true).'</td>'.'<td class="datos2">';
+    // OID.
+    echo '<tr id="tr-oid">';
+    echo '<td class="datos2">'.__('Enterprise String').ui_print_help_tip(__('Matches substrings. End the string with $ for exact matches.'), true).'</td>';
+    echo '<td class="datos2">';
     html_print_input_text('oid', $oid, '', 50, 255);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Custom
+    // Custom.
     echo '<tr id="tr-custom_value"><td class="datos"  valign="top">'.__('Custom Value/OID');
 
     echo '</td><td class="datos">';
     html_print_textarea('custom_value', 2, 2, $custom_value, 'class="w400px"');
 
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // SNMP Agent
+    // SNMP Agent.
     echo '<tr id="tr-source_ip"><td class="datos2">'.__('SNMP Agent').' (IP)</td><td class="datos2">';
     html_print_input_text('source_ip', $source_ip, '', 20);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
     $return_all_group = false;
 
@@ -750,7 +798,7 @@ if ($create_alert || $update_alert) {
         $return_all_group = true;
     }
 
-    // Group
+    // Group.
     echo '<tr id="tr-group"><td class="datos2">'.__('Group').'</td><td class="datos2">';
     echo '<div class="w250px">';
     html_print_select_groups(
@@ -774,183 +822,222 @@ if ($create_alert || $update_alert) {
         false
     );
     echo '</div>';
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Trap type
+    // Trap type.
     echo '<tr><td class="datos">'.__('Trap type').'</td><td class="datos">';
     echo html_print_select($trap_types, 'trap_type', $trap_type, '', '', '', false, false, false);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Single value
+    // Single value.
     echo '<tr><td class="datos">'.__('Single value').'</td><td class="datos">';
     html_print_input_text('single_value', $single_value, '', 20);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Variable bindings/Data #1
-    echo '<tr id="tr-custom_value">'.'<td class="datos"  valign="top">'.__('Variable bindings/Data').'</td><td class="datos">';
+    // Variable bindings/Data #1.
+    echo '<tr id="tr-custom_value">';
+    echo '<td class="datos"  valign="top">'.__('Variable bindings/Data').'</td>';
+    echo '<td class="datos">';
     echo '#';
     html_print_input_text('order_1', $order_1, '', 4);
     html_print_input_text('custom_oid_data_1', $custom_oid_data_1, '', 60);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Variable bindings/Data #2
-    echo '<tr id="tr-custom_value"><td class="datos"  valign="top">'.__('Variable bindings/Data');
-    // echo ui_print_help_icon ("snmp_alert_custom", true);
-    echo '</td><td class="datos">';
+    // Variable bindings/Data #2.
+    echo '<tr id="tr-custom_value">';
+    echo '<td class="datos"  valign="top">'.__('Variable bindings/Data').'</td>';
+    echo '<td class="datos">';
     echo '#';
     html_print_input_text('order_2', $order_2, '', 4);
     html_print_input_text('custom_oid_data_2', $custom_oid_data_2, '', 60);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Variable bindings/Data #3
-    echo '<tr id="tr-custom_value"><td class="datos"  valign="top">'.__('Variable bindings/Data');
-    // echo ui_print_help_icon ("snmp_alert_custom", true);
-    echo '</td><td class="datos">';
+    // Variable bindings/Data #3.
+    echo '<tr id="tr-custom_value">';
+    echo '<td class="datos"  valign="top">'.__('Variable bindings/Data').'</td>';
+    echo '<td class="datos">';
     echo '#';
     html_print_input_text('order_3', $order_3, '', 4);
     html_print_input_text('custom_oid_data_3', $custom_oid_data_3, '', 60);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Variable bindings/Data #4
-    echo '<tr id="tr-custom_value">'.'<td class="datos"  valign="top">'.__('Variable bindings/Data');
-    // echo ui_print_help_icon ("snmp_alert_custom", true);
-    echo '</td><td class="datos">';
+    // Variable bindings/Data #4.
+    echo '<tr id="tr-custom_value">';
+    echo '<td class="datos"  valign="top">'.__('Variable bindings/Data').'</td>';
+    echo '<td class="datos">';
     echo '#';
     html_print_input_text('order_4', $order_4, '', 4);
     html_print_input_text('custom_oid_data_4', $custom_oid_data_4, '', 60);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Variable bindings/Data #5
-    echo '<tr id="tr-custom_value">'.'<td class="datos"  valign="top">'.__('Variable bindings/Data');
-    // echo ui_print_help_icon ("snmp_alert_custom", true);
-    echo '</td><td class="datos">';
+    // Variable bindings/Data #5.
+    echo '<tr id="tr-custom_value">';
+    echo '<td class="datos"  valign="top">'.__('Variable bindings/Data').'</td>';
+    echo '<td class="datos">';
     echo '#';
     html_print_input_text('order_5', $order_5, '', 4);
     html_print_input_text('custom_oid_data_5', $custom_oid_data_5, '', 60);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Variable bindings/Data #6
-    echo '<tr id="tr-custom_value">'.'<td class="datos"  valign="top">'.__('Variable bindings/Data');
-    // echo ui_print_help_icon ("snmp_alert_custom", true);
-    echo '</td><td class="datos">';
+    // Variable bindings/Data #6.
+    echo '<tr id="tr-custom_value">';
+    echo '<td class="datos"  valign="top">'.__('Variable bindings/Data').'</td>';
+    echo '<td class="datos">';
     echo '#';
     html_print_input_text('order_6', $order_6, '', 4);
     html_print_input_text('custom_oid_data_6', $custom_oid_data_6, '', 60);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Variable bindings/Data #7
-    echo '<tr id="tr-custom_value">'.'<td class="datos"  valign="top">'.__('Variable bindings/Data');
-    echo '</td><td class="datos">';
+    // Variable bindings/Data #7.
+    echo '<tr id="tr-custom_value">';
+    echo '<td class="datos"  valign="top">'.__('Variable bindings/Data').'</td>';
+    echo '<td class="datos">';
     echo '#';
     html_print_input_text('order_7', $order_7, '', 4);
     html_print_input_text('custom_oid_data_7', $custom_oid_data_7, '', 60);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Variable bindings/Data #8
-    echo '<tr id="tr-custom_value">'.'<td class="datos"  valign="top">'.__('Variable bindings/Data');
-    echo '</td><td class="datos">';
+    // Variable bindings/Data #8.
+    echo '<tr id="tr-custom_value">';
+    echo '<td class="datos"  valign="top">'.__('Variable bindings/Data').'</td>';
+    echo '<td class="datos">';
     echo '#';
     html_print_input_text('order_8', $order_8, '', 4);
     html_print_input_text('custom_oid_data_8', $custom_oid_data_8, '', 60);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Variable bindings/Data #9
-    echo '<tr id="tr-custom_value">'.'<td class="datos"  valign="top">'.__('Variable bindings/Data');
-    echo '</td><td class="datos">';
+    // Variable bindings/Data #9.
+    echo '<tr id="tr-custom_value">';
+    echo '<td class="datos"  valign="top">'.__('Variable bindings/Data').'</td>';
+    echo '<td class="datos">';
     echo '#';
     html_print_input_text('order_9', $order_9, '', 4);
     html_print_input_text('custom_oid_data_9', $custom_oid_data_9, '', 60);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Variable bindings/Data #10
-    echo '<tr id="tr-custom_value">'.'<td class="datos"  valign="top">'.__('Variable bindings/Data');
-    echo '</td><td class="datos">';
+    // Variable bindings/Data #10.
+    echo '<tr id="tr-custom_value">';
+    echo '<td class="datos"  valign="top">'.__('Variable bindings/Data').'</td>';
+    echo '<td class="datos">';
     echo '#';
     html_print_input_text('order_10', $order_10, '', 4);
     html_print_input_text('custom_oid_data_10', $custom_oid_data_10, '', 60);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Variable bindings/Data #11
-    echo '<tr id="tr-custom_value">'.'<td class="datos"  valign="top">'.__('Variable bindings/Data');
-    echo '</td><td class="datos">';
+    // Variable bindings/Data #11.
+    echo '<tr id="tr-custom_value">';
+    echo '<td class="datos"  valign="top">'.__('Variable bindings/Data').'</td>';
+    echo '<td class="datos">';
     echo '#';
     html_print_input_text('order_11', $order_11, '', 4);
     html_print_input_text('custom_oid_data_11', $custom_oid_data_11, '', 60);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Variable bindings/Data #12
-    echo '<tr id="tr-custom_value">'.'<td class="datos"  valign="top">'.__('Variable bindings/Data');
-    echo '</td><td class="datos">';
+    // Variable bindings/Data #12.
+    echo '<tr id="tr-custom_value">';
+    echo '<td class="datos"  valign="top">'.__('Variable bindings/Data').'</td>';
+    echo '<td class="datos">';
     echo '#';
     html_print_input_text('order_12', $order_12, '', 4);
     html_print_input_text('custom_oid_data_12', $custom_oid_data_12, '', 60);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Variable bindings/Data #13
-    echo '<tr id="tr-custom_value"><td class="datos"  valign="top">'.__('Variable bindings/Data');
-    echo '</td><td class="datos">';
+    // Variable bindings/Data #13.
+    echo '<tr id="tr-custom_value">';
+    echo '<td class="datos"  valign="top">'.__('Variable bindings/Data').'</td>';
+    echo '<td class="datos">';
     echo '#';
     html_print_input_text('order_13', $order_13, '', 4);
     html_print_input_text('custom_oid_data_13', $custom_oid_data_13, '', 60);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Variable bindings/Data #14
-    echo '<tr id="tr-custom_value"><td class="datos"  valign="top">'.__('Variable bindings/Data');
-    echo '</td><td class="datos">';
+    // Variable bindings/Data #14.
+    echo '<tr id="tr-custom_value">';
+    echo '<td class="datos"  valign="top">'.__('Variable bindings/Data').'</td>';
+    echo '<td class="datos">';
     echo '#';
     html_print_input_text('order_14', $order_14, '', 4);
     html_print_input_text('custom_oid_data_14', $custom_oid_data_14, '', 60);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Variable bindings/Data #15
-    echo '<tr id="tr-custom_value"><td class="datos"  valign="top">'.__('Variable bindings/Data');
-    echo '</td><td class="datos">';
+    // Variable bindings/Data #15.
+    echo '<tr id="tr-custom_value">';
+    echo '<td class="datos"  valign="top">'.__('Variable bindings/Data').'</td>';
+    echo '<td class="datos">';
     echo '#';
     html_print_input_text('order_15', $order_15, '', 4);
     html_print_input_text('custom_oid_data_15', $custom_oid_data_15, '', 60);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Variable bindings/Data #16
-    echo '<tr id="tr-custom_value"><td class="datos"  valign="top">'.__('Variable bindings/Data');
-    echo '</td><td class="datos">';
+    // Variable bindings/Data #16.
+    echo '<tr id="tr-custom_value">';
+    echo '<td class="datos"  valign="top">'.__('Variable bindings/Data').'</td>';
+    echo '<td class="datos">';
     echo '#';
     html_print_input_text('order_16', $order_16, '', 4);
     html_print_input_text('custom_oid_data_16', $custom_oid_data_16, '', 60);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Variable bindings/Data #17
-    echo '<tr id="tr-custom_value"><td class="datos"  valign="top">'.__('Variable bindings/Data');
-    echo '</td><td class="datos">';
+    // Variable bindings/Data #17.
+    echo '<tr id="tr-custom_value">';
+    echo '<td class="datos"  valign="top">'.__('Variable bindings/Data').'</td>';
+    echo '<td class="datos">';
     echo '#';
     html_print_input_text('order_17', $order_17, '', 4);
     html_print_input_text('custom_oid_data_17', $custom_oid_data_17, '', 60);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Variable bindings/Data #18
-    echo '<tr id="tr-custom_value"><td class="datos"  valign="top">'.__('Variable bindings/Data');
-    echo '</td><td class="datos">';
+    // Variable bindings/Data #18.
+    echo '<tr id="tr-custom_value">';
+    echo '<td class="datos"  valign="top">'.__('Variable bindings/Data').'</td>';
+    echo '<td class="datos">';
     echo '#';
     html_print_input_text('order_18', $order_18, '', 4);
     html_print_input_text('custom_oid_data_18', $custom_oid_data_18, '', 60);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Variable bindings/Data #19
-    echo '<tr id="tr-custom_value"><td class="datos"  valign="top">'.__('Variable bindings/Data');
-    echo '</td><td class="datos">';
+    // Variable bindings/Data #19.
+    echo '<tr id="tr-custom_value">';
+    echo '<td class="datos"  valign="top">'.__('Variable bindings/Data').'</td>';
+    echo '<td class="datos">';
     echo '#';
     html_print_input_text('order_19', $order_19, '', 4);
     html_print_input_text('custom_oid_data_19', $custom_oid_data_19, '', 60);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Variable bindings/Data #20
-    echo '<tr id="tr-custom_value"><td class="datos"  valign="top">'.__('Variable bindings/Data');
-    echo '</td><td class="datos">';
+    // Variable bindings/Data #20.
+    echo '<tr id="tr-custom_value">';
+    echo '<td class="datos"  valign="top">'.__('Variable bindings/Data').'</td>';
+    echo '<td class="datos">';
     echo '#';
     html_print_input_text('order_20', $order_20, '', 4);
     html_print_input_text('custom_oid_data_20', $custom_oid_data_20, '', 60);
-    echo '</td></tr>';
+    echo '</td>';
+    echo '</tr>';
 
-    // Alert fields
+    // Alert fields.
     $al = [
         'al_field1'  => $al_field1,
         'al_field2'  => $al_field2,
@@ -974,7 +1061,7 @@ if ($create_alert || $update_alert) {
         'al_field20' => $al_field20,
     ];
 
-    // Hidden div with help hint to fill with javascript
+    // Hidden div with help hint to fill with javascript.
     html_print_div(['id' => 'help_snmp_alert_hint', 'content' => ui_print_help_icon('snmp_alert_field1', true), 'hidden' => true]);
 
     for ($i = 1; $i <= $config['max_macro_fields']; $i++) {
@@ -984,7 +1071,7 @@ if ($create_alert || $update_alert) {
         echo '</td></tr>';
     }
 
-    // Max / Min alerts
+    // Max / Min alerts.
     echo '<tr><td class="datos2">'.__('Min. number of alerts').'</td><td class="datos2">';
     html_print_input_text('min_alerts', $min_alerts, '', 3);
 
@@ -992,7 +1079,7 @@ if ($create_alert || $update_alert) {
     html_print_input_text('max_alerts', $max_alerts, '', 3);
     echo '</td></tr>';
 
-    // Time Threshold
+    // Time Threshold.
     echo '<tr><td class="datos2">'.__('Time threshold').'</td><td class="datos2">';
 
     $fields = [];
@@ -1014,7 +1101,7 @@ if ($create_alert || $update_alert) {
     html_print_input_text('time_other', 0, '', 6);
     echo ' '.__('seconds').'</div></td></tr>';
 
-    // Priority
+    // Priority.
     echo '<tr><td class="datos">'.__('Priority').'</td><td class="datos">';
     echo html_print_select(get_priorities(), 'priority', $priority, '', '', '0', false, false, false);
     echo '</td></tr>';
@@ -1048,10 +1135,11 @@ if ($create_alert || $update_alert) {
 
     echo "<table class='w100p'>";
     echo '<tr><td></td><td align="right">';
+    html_print_button(__('Back'), 'button_back', false, '', 'class="sub cancel margin-right-05"');
     if ($id_as > 0) {
-        html_print_submit_button(__('Update'), 'submit', false, 'class="sub upd"', false);
+        html_print_submit_button(__('Update'), 'submit', false, 'class="sub upd"');
     } else {
-        html_print_submit_button(__('Create'), 'submit', false, 'class="sub wand"', false);
+        html_print_submit_button(__('Create'), 'submit', false, 'class="sub wand"');
     }
 
     echo '</td></tr></table>';
@@ -1089,119 +1177,68 @@ if ($create_alert || $update_alert) {
     $form_filter .= '</div>';
     $form_filter .= '</form>';
 
-    // echo "<br>";
     ui_toggle($form_filter, __('Alert SNMP control filter'), __('Toggle filter(s)'));
 
     $filter = [];
     $offset = (int) get_parameter('offset');
     $limit = (int) $config['block_size'];
     if ($filter_param) {
-        // Move the first page
+        // Move the first page.
         $offset = 0;
 
-        $url_pagination = 'index.php?'.'sec=snmpconsole&'.'sec2=godmode/snmpconsole/snmp_alert&'.'free_search='.$free_search.'&'.'trap_type_filter='.$trap_type_filter.'&'.'priority_filter='.$priority_filter;
+        $url_pagination = 'index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&free_search='.$free_search.'&trap_type_filter='.$trap_type_filter.'&priority_filter='.$priority_filter;
     } else {
-        $url_pagination = 'index.php?'.'sec=snmpconsole&'.'sec2=godmode/snmpconsole/snmp_alert&'.'free_search='.$free_search.'&'.'trap_type_filter='.$trap_type_filter.'&'.'priority_filter='.$priority_filter.'&'.'offset='.$offset;
+        $url_pagination = 'index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&free_search='.$free_search.'&trap_type_filter='.$trap_type_filter.'&priority_filter='.$priority_filter.'&offset='.$offset;
     }
 
 
     $where_sql = '';
-    if (!empty($free_search)) {
-        switch ($config['dbtype']) {
-            case 'mysql':
-            case 'postgresql':
-                // $where_sql = ' 1 = 1';
-                if ($trap_type_filter != SNMP_TRAP_TYPE_NONE) {
-                    $where_sql .= ' AND `trap_type` = '.$trap_type_filter;
-                }
-
-                if ($priority_filter != -1) {
-                    $where_sql .= ' AND `priority` = '.$priority_filter;
-                }
-
-                $where_sql .= " AND (`single_value` LIKE '%".$free_search."%'
-					OR `_snmp_f10_` LIKE '%".$free_search."%'
-					OR `_snmp_f9_` LIKE '%".$free_search."%'
-					OR `_snmp_f8_` LIKE '%".$free_search."%'
-					OR `_snmp_f7_` LIKE '%".$free_search."%'
-					OR `_snmp_f6_` LIKE '%".$free_search."%'
-					OR `_snmp_f5_` LIKE '%".$free_search."%'
-					OR `_snmp_f4_` LIKE '%".$free_search."%'
-					OR `_snmp_f3_` LIKE '%".$free_search."%'
-					OR `_snmp_f2_` LIKE '%".$free_search."%'
-					OR `_snmp_f1_` LIKE '%".$free_search."%'
-					OR `oid` LIKE '%".$free_search."%'
-					OR `custom_oid` LIKE '%".$free_search."%'
-					OR `agent` LIKE '%".$free_search."%'
-					OR `description` LIKE '%".$free_search."%')";
-            break;
-
-            case 'oracle':
-                // $where_sql = ' 1 = 1';
-                if ($trap_type_filter != SNMP_TRAP_TYPE_NONE) {
-                    $where_sql .= ' AND trap_type = '.$trap_type_filter;
-                }
-
-                if ($priority_filter != -1) {
-                    $where_sql .= ' AND priority = '.$priority_filter;
-                }
-
-                $where_sql .= " AND (single_value LIKE '%".$free_search."%' 
-					OR \"_snmp_f10_\" LIKE '%".$free_search."%' 
-					OR \"_snmp_f9_\" LIKE '%".$free_search."%' 
-					OR \"_snmp_f8_\" LIKE '%".$free_search."%' 
-					OR \"_snmp_f7_\" LIKE '%".$free_search."%' 
-					OR \"_snmp_f6_\" LIKE '%".$free_search."%' 
-					OR \"_snmp_f5_\" LIKE '%".$free_search."%' 
-					OR \"_snmp_f4_\" LIKE '%".$free_search."%' 
-					OR \"_snmp_f3_\" LIKE '%".$free_search."%' 
-					OR \"_snmp_f2_\" LIKE '%".$free_search."%' 
-					OR \"_snmp_f1_\" LIKE '%".$free_search."%' 
-					OR oid LIKE '%".$free_search."%' 
-					OR custom_oid LIKE '%".$free_search."%' 
-					OR agent LIKE '%".$free_search."%' 
-					OR description LIKE '%".$free_search."%')";
-            break;
+    if (empty($free_search) === false) {
+        if ($trap_type_filter != SNMP_TRAP_TYPE_NONE) {
+            $where_sql .= ' AND `trap_type` = '.$trap_type_filter;
         }
+
+        if ($priority_filter != -1) {
+            $where_sql .= ' AND `priority` = '.$priority_filter;
+        }
+
+        $where_sql .= " AND (`single_value` LIKE '%".$free_search."%'
+            OR `_snmp_f10_` LIKE '%".$free_search."%'
+            OR `_snmp_f9_` LIKE '%".$free_search."%'
+            OR `_snmp_f8_` LIKE '%".$free_search."%'
+            OR `_snmp_f7_` LIKE '%".$free_search."%'
+            OR `_snmp_f6_` LIKE '%".$free_search."%'
+            OR `_snmp_f5_` LIKE '%".$free_search."%'
+            OR `_snmp_f4_` LIKE '%".$free_search."%'
+            OR `_snmp_f3_` LIKE '%".$free_search."%'
+            OR `_snmp_f2_` LIKE '%".$free_search."%'
+            OR `_snmp_f1_` LIKE '%".$free_search."%'
+            OR `oid` LIKE '%".$free_search."%'
+            OR `custom_oid` LIKE '%".$free_search."%'
+            OR `agent` LIKE '%".$free_search."%'
+            OR `description` LIKE '%".$free_search."%')";
     }
 
-    $count = db_get_value_sql(
-        "SELECT COUNT(*)
-		FROM talert_snmp WHERE id_group IN ($str_user_groups) ".$where_sql
+    $count = (int) db_get_value_sql(
+        'SELECT COUNT(*)
+		FROM talert_snmp WHERE id_group IN ('.$str_user_groups.') '.$where_sql
     );
 
     $result = [];
 
-    // Overview
-    if ($count == 0) {
+    // Overview.
+    if ($count === 0) {
         $result = [];
         ui_print_info_message(['no_close' => true, 'message' => __('There are no SNMP alerts') ]);
     } else {
         ui_pagination($count, $url_pagination);
-        switch ($config['dbtype']) {
-            case 'mysql':
-            case 'postgresql':
-                $where_sql .= ' LIMIT '.$limit.' OFFSET '.$offset;
-                $result = db_get_all_rows_sql(
-                    "SELECT *
-					FROM talert_snmp 
-					WHERE id_group IN ($str_user_groups) ".$where_sql
-                );
-            break;
 
-            case 'oracle':
-                $sql = "SELECT *
-					FROM talert_snmp 
-					WHERE id_group IN ($str_user_groups) ".$where_sql;
-                $set = [];
-                if (isset($offset) && isset($limit)) {
-                    $set['limit'] = $limit;
-                    $set['offset'] = $offset;
-                }
-
-                $result = oracle_recode_query($sql, $set, 'AND', false);
-            break;
-        }
+        $where_sql .= ' LIMIT '.$limit.' OFFSET '.$offset;
+        $result = db_get_all_rows_sql(
+            'SELECT *
+            FROM talert_snmp
+            WHERE id_group IN ('.$str_user_groups.') '.$where_sql
+        );
     }
 
     $table = new stdClass();
@@ -1250,7 +1287,7 @@ if ($create_alert || $update_alert) {
         $data = [];
         $data[0] = $row['position'];
 
-        $url = 'index.php?'.'sec=snmpconsole&'.'sec2=godmode/snmpconsole/snmp_alert&'.'id_alert_snmp='.$row['id_as'].'&'.'update_alert=1';
+        $url = 'index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&id_alert_snmp='.$row['id_as'].'&update_alert=1';
         $data[1] = '<table>';
         $data[1] .= '<tr>';
 
@@ -1281,50 +1318,86 @@ if ($create_alert || $update_alert) {
         }
 
         $data[1] .= '</table>';
-
-
         $data[2] = $row['agent'];
         $data[3] = $row['oid'];
         $data[4] = $row['custom_oid'];
         $data[5] = $row['description'];
         $data[6] = $row['times_fired'];
 
-        if (($row['last_fired'] != '1970-01-01 00:00:00') and ($row['last_fired'] != '01-01-1970 00:00:00')) {
+        if (($row['last_fired'] !== '1970-01-01 00:00:00') && ($row['last_fired'] !== '01-01-1970 00:00:00')) {
             $data[7] = ui_print_timestamp($row['last_fired'], true);
         } else {
             $data[7] = __('Never');
         }
 
-        if (check_acl_restricted_all($config['id_user'], $row['id_group'], 'LW')) {
-                $data[8] = '<a href="index.php?'.'sec=snmpconsole&'.'sec2=godmode/snmpconsole/snmp_alert&'.'duplicate_alert=1&'.'id_alert_snmp='.$row['id_as'].'">'.html_print_image(
-                    'images/copy.png',
-                    true,
-                    [
-                        'alt'   => __('Duplicate'),
-                        'title' => __('Duplicate'),
-                    ]
-                ).'</a>'.'<a href="index.php?'.'sec=snmpconsole&'.'sec2=godmode/snmpconsole/snmp_alert&'.'update_alert=1&'.'id_alert_snmp='.$row['id_as'].'">'.html_print_image(
-                    'images/config.png',
-                    true,
-                    [
-                        'border' => '0',
-                        'alt'    => __('Update'),
-                    ]
-                ).'</a>'.'<a href="javascript:show_add_action_snmp(\''.$row['id_as'].'\');">'.html_print_image(
-                    'images/add.png',
-                    true,
-                    [
-                        'title' => __('Add action'),
-                    ]
-                ).'</a>'.'<a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&delete_alert='.$row['id_as'].'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')">'.html_print_image(
-                    'images/cross.png',
-                    true,
-                    [
-                        'border' => '0',
-                        'alt'    => __('Delete'),
-                    ]
-                ).'</a>';
+        $data[8] = '';
+        $data[9] = '';
 
+        if ((bool) check_acl_restricted_all($config['id_user'], $row['id_group'], 'LW') === true) {
+                $data[8] = html_print_anchor(
+                    [
+                        'href'    => sprintf(
+                            'index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&duplicate_alert=1&id_alert_snmp=%s',
+                            $row['id_as']
+                        ),
+                        'content' => html_print_image(
+                            'images/copy.png',
+                            true,
+                            [
+                                'alt'   => __('Duplicate'),
+                                'title' => __('Duplicate'),
+                            ]
+                        ),
+                    ],
+                    true
+                );
+                $data[8] .= html_print_anchor(
+                    [
+                        'href'    => sprintf(
+                            'index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&update_alert=1&id_alert_snmp=%s',
+                            $row['id_as']
+                        ),
+                        'content' => html_print_image(
+                            'images/config.png',
+                            true,
+                            [
+                                'alt'    => __('Update'),
+                                'border' => 0,
+                            ]
+                        ),
+                    ],
+                    true
+                );
+                $data[8] .= html_print_anchor(
+                    [
+                        'href'    => sprintf(
+                            'javascript:show_add_action_snmp(\'%s\');"',
+                            $row['id_as']
+                        ),
+                        'content' => html_print_image(
+                            'images/add.png',
+                            true,
+                            [
+                                'title' => __('Add action'),
+                            ]
+                        ),
+                    ],
+                    true
+                );
+                $data[8] .= html_print_anchor(
+                    [
+                        'href'    => 'javascript: ',
+                        'content' => html_print_image(
+                            'images/cross.png',
+                            true,
+                            [
+                                'title' => __('Delete action'),
+                            ]
+                        ),
+                        'onClick' => 'delete_snmp_alert('.$row['id_as'].')',
+                    ],
+                    true
+                );
 
                 $data[9] = html_print_checkbox_extended(
                     'delete_ids[]',
@@ -1335,71 +1408,47 @@ if ($create_alert || $update_alert) {
                     'class="chk_delete"',
                     true
                 );
-        } else {
-            $data[8] = '';
-            $data[9] = '';
         }
 
         $idx = count($table->data);
-        // The current index of the table is 1 less than the count of table data so we count before adding to table->data
+        // The current index of the table is 1 less than the count of table data so we count before adding to table->data.
         array_push($table->data, $data);
 
         $table->rowclass[$idx] = get_priority_class($row['priority']);
     }
 
-    // DIALOG ADD MORE ACTIONS
+    // DIALOG ADD MORE ACTIONS.
     echo '<div id="add_action_snmp-div" class="invisible left">';
 
         echo '<form id="add_action_form" method="post">';
-            echo '<table class="databox_color w100p">';
+            echo '<table class="w100p">';
                 echo '<tr>';
-                    echo '<td class="datos2 bolder_6px">';
+                    echo '<td class="datos bolder w20p">';
                         echo __('ID Alert SNMP');
                     echo '</td>';
                     echo '<td class="datos">';
                         html_print_input_text('id_alert_snmp', '', '', 3, 10, false, true);
                     echo '</td>';
                 echo '</tr>';
-                echo '<tr class="datos2">';
-                    echo '<td class="datos2 bolder_6px">';
+                echo '<tr class="datos">';
+                    echo '<td class="datos bolder w20p">';
                         echo __('Action');
                     echo '</td>';
-                    echo '<td class="datos2">';
+                    echo '<td class="datos">';
 
-    switch ($config['dbtype']) {
-        case 'mysql':
-        case 'postgresql':
-            html_print_select_from_sql(
-                'SELECT id, name
-									FROM talert_actions
-									ORDER BY name',
-                'alert_type',
-                $alert_type,
-                '',
-                '',
-                0,
-                false,
-                false,
-                false
-            );
-        break;
-
-        case 'oracle':
-            html_print_select_from_sql(
-                'SELECT id, dbms_lob.substr(name,4000,1) as name
-									FROM talert_actions
-									ORDER BY dbms_lob.substr(name,4000,1)',
-                'alert_type',
-                $alert_type,
-                '',
-                '',
-                0,
-                false,
-                false,
-                false
-            );
-        break;
-    }
+                    html_print_select_from_sql(
+                        'SELECT id, name
+                        FROM talert_actions
+                        ORDER BY name',
+                        'alert_type',
+                        $alert_type,
+                        '',
+                        '',
+                        0,
+                        false,
+                        false,
+                        false
+                    );
 
                     echo '</td>';
                 echo '</tr>';
@@ -1445,16 +1494,16 @@ if ($create_alert || $update_alert) {
                 echo html_print_submit_button(__('Add'), 'addbutton', false, ['class' => 'sub next', 'style' => 'float:right'], true);
                 echo '</form>';
                 echo '</div>';
-                // END DIALOG ADD MORE ACTIONS
-                if (!empty($table->data)) {
-                    echo '<form name="agente" method="post" action="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert">';
+                // END DIALOG ADD MORE ACTIONS.
+                if (empty($table->data) === false) {
+                    echo '<form id="delete_selected_form" name="agente" method="post" action="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert">';
                     html_print_table($table);
 
                     ui_pagination($count, $url_pagination);
 
                     echo '<div class="right mrgn_lft_10px;">';
                     html_print_input_hidden('multiple_delete', 1);
-                    html_print_submit_button(__('Delete selected'), 'delete_button', false, 'class="sub delete mrgn_btn_10px"');
+                    html_print_button(__('Delete selected'), 'delete_button', false, 'delete_selected_snmp_alerts()', 'class="sub delete mrgn_btn_10px"');
                     echo '</div>';
                     echo '</form>';
                 }
@@ -1491,6 +1540,36 @@ function time_changed () {
     }
 }
 
+function delete_snmp_alert(id) {
+    confirmDialog({
+    title: "<?php echo __('Confirmation'); ?>",
+    message: "<?php echo __('Do you want delete this alert?'); ?>",
+    cancel: "<?php echo __('Cancel'); ?>",
+    ok: "<?php echo __('Ok'); ?>",
+    onAccept: function() {
+      window.location.href = 'index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&delete_alert='+id;
+    },
+    onDeny: function() {
+      return false;
+    }
+  });
+}
+
+function delete_selected_snmp_alerts() {
+    confirmDialog({
+    title: "<?php echo __('Confirmation'); ?>",
+    message: "<?php echo __('Do you want delete the selected alerts?'); ?>",
+    cancel: "<?php echo __('Cancel'); ?>",
+    ok: "<?php echo __('Ok'); ?>",
+    onAccept: function() {
+      $('#delete_selected_form').submit();
+    },
+    onDeny: function() {
+      return false;
+    }
+  });
+}
+
 $(document).ready (function () {
     $('#time_threshold').change (time_changed);
     $("input[name=all_delete_box]").change (function() {
@@ -1578,10 +1657,13 @@ $(document).ready (function () {
     }
 
     defineTinyMCE(added_config);
+
+    $('#button-button_back').on('click', function(){
+        window.location = '<?php echo ui_get_full_url('index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert'); ?>';
+    });
 });
 
 function show_add_action_snmp(id_alert_snmp) {
-    
     $("#add_action_snmp-div").hide()
         .dialog ({
             resizable: true,
@@ -1592,8 +1674,28 @@ function show_add_action_snmp(id_alert_snmp) {
                 opacity: 0.5,
                 background: "black"
             },
-            width: 550,
-            height: 400
+            width: 600,
+            height: 600,
+            autoOpen: true,
+            open: function() {
+                if (
+                $.ui &&
+                $.ui.dialog &&
+                $.ui.dialog.prototype._allowInteraction
+                ) {
+                var ui_dialog_interaction =
+                    $.ui.dialog.prototype._allowInteraction;
+                $.ui.dialog.prototype._allowInteraction = function(e) {
+                    if ($(e.target).closest(".select2-dropdown").length)
+                    return true;
+                    return ui_dialog_interaction.apply(this, arguments);
+                };
+                }
+            },
+            _allowInteraction: function(event) {
+                return !!$(event.target).is(".select2-input") || this._super(event);
+            }
+
         })
         .show ();
         $("#text-id_alert_snmp").val(id_alert_snmp);
diff --git a/pandora_console/include/class/AgentWizard.class.php b/pandora_console/include/class/AgentWizard.class.php
index 1600aab4b6..979c2fed3f 100644
--- a/pandora_console/include/class/AgentWizard.class.php
+++ b/pandora_console/include/class/AgentWizard.class.php
@@ -3559,7 +3559,8 @@ class AgentWizard extends HTML
             $this->targetPort,
             $this->server,
             $this->extraArguments,
-            (($full_output === false) ? '-Oa -On' : '-Oa')
+            (($full_output === false) ? '-On' : '-Oa'),
+            ''
         );
 
         if ($pure === true) {
@@ -3572,7 +3573,12 @@ class AgentWizard extends HTML
                 if ($full_output === true) {
                     $output[] = $key.' = '.$oid_unit;
                 } else {
-                    preg_match('/\.\d+$/', $key, $index);
+                    $index = [];
+                    $index[] = preg_replace('/^'.$oid.'/', '', $key);
+                    if (empty($index) === true) {
+                        preg_match('/\.\d+$/', $key, $index);
+                    }
+
                     $tmp = explode(': ', $oid_unit);
                     $output[$index[0]] = str_replace('"', '', ($tmp[1] ?? ''));
                 }
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 9db7f38355..530016aa01 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 = 'PC220616';
+$build_version = 'PC220620';
 $pandora_version = 'v7.0NG.762';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index c1b6697022..7346ba7788 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -1993,7 +1993,8 @@ function get_snmpwalk(
     $snmp_port='',
     $server_to_exec=0,
     $extra_arguments='',
-    $format='-Oa'
+    $format='-Oa',
+    $load_mibs='-m ALL'
 ) {
     global $config;
 
@@ -2057,15 +2058,15 @@ function get_snmpwalk(
         case '3':
             switch ($snmp3_security_level) {
                 case 'authNoPriv':
-                    $command_str = $snmpwalk_bin.' -m ALL '.$format.' '.$extra_arguments.' -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
+                    $command_str = $snmpwalk_bin.' '.$load_mibs.' '.$format.' '.$extra_arguments.' -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
                 break;
 
                 case 'noAuthNoPriv':
-                    $command_str = $snmpwalk_bin.' -m ALL '.$format.' '.$extra_arguments.' -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -l '.escapeshellarg($snmp3_security_level).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
+                    $command_str = $snmpwalk_bin.' '.$load_mibs.' '.$format.' '.$extra_arguments.' -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -l '.escapeshellarg($snmp3_security_level).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
                 break;
 
                 default:
-                    $command_str = $snmpwalk_bin.' -m ALL '.$format.' '.$extra_arguments.' -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' -x '.escapeshellarg($snmp3_privacy_method).' -X '.escapeshellarg($snmp3_privacy_pass).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
+                    $command_str = $snmpwalk_bin.' '.$load_mibs.' '.$format.' '.$extra_arguments.' -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' -x '.escapeshellarg($snmp3_privacy_method).' -X '.escapeshellarg($snmp3_privacy_pass).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
                 break;
             }
         break;
@@ -2074,7 +2075,7 @@ function get_snmpwalk(
         case '2c':
         case '1':
         default:
-            $command_str = $snmpwalk_bin.' -m ALL '.$extra_arguments.' '.$format.' -v '.escapeshellarg($snmp_version).' -c '.escapeshellarg(io_safe_output($snmp_community)).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
+            $command_str = $snmpwalk_bin.' '.$load_mibs.' '.$extra_arguments.' '.$format.' -v '.escapeshellarg($snmp_version).' -c '.escapeshellarg(io_safe_output($snmp_community)).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
         break;
     }
 
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 83f2a89ac2..da9d972f4a 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -814,6 +814,13 @@ select:-internal-list-box {
 .margin-left-2 {
   margin-left: 2em;
 }
+.margin-right-05 {
+  margin-right: 0.5em;
+}
+
+.margin-left-05 {
+  margin-left: 0.5em;
+}
 .no-border {
   border: none;
 }
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 47a6e72997..81a352c816 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.762';
-            $build = '220613';
+            $build = '220620';
             $banner = "v$version Build $build";
 
             error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 8c56a051ce..c6391d6b18 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.762
-%define release     220616
+%define release     220620
 
 # 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 d67df879aa..b7a7850eef 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.762
-%define release     220616
+%define release     220620
 
 # 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 b17922032b..acbee11566 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.762
-%define release     220616
+%define release     220620
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 88e8056af5..6c12070028 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.762-220616
+Version: 7.0NG.762-220620
 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 c7a1a53370..fbc6049862 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.762-220616"
+pandora_version="7.0NG.762-220620"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 6a2dffb4bc..28fbd652bd 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.762";
-my $pandora_build = "220616";
+my $pandora_build = "220620";
 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 acc4d83546..b33d0f95da 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -506,7 +506,7 @@ B<Returns>:
 ##########################################################################
 sub pandora_evaluate_alert ($$$$$$$;$$$$) {
 	my ($pa_config, $agent, $data, $last_status, $alert, $utimestamp, $dbh,
-	  $last_data_value, $correlatedItems, $event, $log) = @_;
+	  $last_data_value, $correlated_items, $event, $log) = @_;
 	
 	if (defined ($agent)) {
 		logger ($pa_config, "Evaluating alert '" . safe_output($alert->{'name'}) . "' for agent '" . safe_output ($agent->{'nombre'}) . "'.", 10);
@@ -604,13 +604,16 @@ sub pandora_evaluate_alert ($$$$$$$;$$$$) {
 			
 			# Cease on valid data
 			$status = 3;
-			
+		
+			# Unlike module alerts, correlated alerts recover when they cease!
+			$status = 4 if ($alert->{'recovery_notify'} == 1 && !defined($alert->{'id_template_module'}));
+
 			# Always reset
 			($alert->{'internal_counter'}, $alert->{'times_fired'}) = (0, 0);
 		}
 		
 		# Recover takes precedence over cease
-		$status = 4 if ($alert->{'recovery_notify'} == 1);
+		$status = 4 if ($alert->{'recovery_notify'} == 1 && defined ($alert->{'id_template_module'}));
 		
 	}
 	elsif ($utimestamp > $limit_utimestamp && $alert->{'internal_counter'} > 0) {
@@ -691,7 +694,7 @@ sub pandora_evaluate_alert ($$$$$$$;$$$$) {
 				$pa_config,
 				$dbh,
 				$alert,
-				$correlatedItems,
+				$correlated_items,
 				$event,
 				$log
 			]
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 74c972bf88..3f53a64183 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.762";
-my $pandora_build = "220616";
+my $pandora_build = "220620";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
@@ -609,15 +609,14 @@ sub print_module {
 	$data->{critical_instructions} = $conf->{critical_instructions} unless (defined($data->{critical_instructions}) || (!defined($conf->{critical_instructions})));
 
 	# Translation compatibility
-	$data->{'min_warning'}      = $data->{'wmin'} if empty($data->{'min_warning'});
-	$data->{'max_warning'}      = $data->{'wmax'} if empty($data->{'max_warning'});
-	$data->{'min_critical'}     = $data->{'cmin'} if empty($data->{'min_critical'});
-	$data->{'max_critical'}     = $data->{'cmax'} if empty($data->{'max_critical'});
-	$data->{'warning_inverse'}  = $data->{'winv'} if empty($data->{'warning_inverse'});
-	$data->{'critical_inverse'} = $data->{'cinv'} if empty($data->{'critical_inverse'});
-	$data->{'str_warning'}      = $data->{'wstr'} if empty($data->{'str_warning'});
-	$data->{'str_critical'}     = $data->{'cstr'} if empty($data->{'str_critical'});
-
+	$data->{min_warning}      = $data->{'wmin'} if empty($data->{min_warning});
+	$data->{max_warning}      = $data->{'wmax'} if empty($data->{max_warning});
+	$data->{min_critical}     = $data->{'cmin'} if empty($data->{min_critical});
+	$data->{max_critical}     = $data->{'cmax'} if empty($data->{max_critical});
+	$data->{warning_inverse}  = $data->{'winv'} if empty($data->{warning_inverse});
+	$data->{critical_inverse} = $data->{'cinv'} if empty($data->{critical_inverse});
+	$data->{str_warning}      = $data->{'wstr'} if empty($data->{str_warning});
+	$data->{str_critical}     = $data->{'cstr'} if empty($data->{str_critical});
 
 	$xml_module .= "<module>\n";
 	$xml_module .= "\t<name><![CDATA[" . $data->{name} . "]]></name>\n";
diff --git a/pandora_server/lib/PandoraFMS/Recon/Base.pm b/pandora_server/lib/PandoraFMS/Recon/Base.pm
index f0b70cd0df..66d47a782a 100644
--- a/pandora_server/lib/PandoraFMS/Recon/Base.pm
+++ b/pandora_server/lib/PandoraFMS/Recon/Base.pm
@@ -1628,9 +1628,14 @@ sub database_scan($$$) {
   $self->{'summary'}->{'discovered'} += 1;
   $self->{'summary'}->{'alive'} += 1;
 
+  my $name = $type . ' connection';
+  if (defined $obj->{'prefix_module_name'} && $obj->{'prefix_module_name'} ne '') {
+    $name = $obj->{'prefix_module_name'} . $type . ' connection';
+  }
+
   push @modules,
     {
-    name => $type . ' connection',
+    name => $name,
     type => 'generic_proc',
     data => 1,
     description => $type . ' availability'
@@ -1778,8 +1783,14 @@ sub app_scan($) {
         # Update progress
         $self->call('update_progress', $global_percent + (90 / (scalar @targets)));
         $self->{'summary'}->{'not_alive'} += 1;
+
+        my $name = $type . ' connection';
+        if (defined $obj->{'prefix_module_name'} && $obj->{'prefix_module_name'} ne '') {
+          $name = $obj->{'prefix_module_name'} . $type . ' connection';
+        }
+
         push @modules, {
-          name => $type . ' connection',
+          name => $name,
           type => 'generic_proc',
           data => 0,
           description => $type . ' availability'
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 8c1e0fdab9..bb3b63219c 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.762
-%define release     220616
+%define release     220620
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 7f8879a00c..f31e0fcd07 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.762
-%define release     220616
+%define release     220620
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 2cfa52c101..72a13f9a0c 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.762"
-PI_BUILD="220616"
+PI_BUILD="220620"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index d9eb2ebdae..d554701dc2 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.762 Build 220616";
+my $version = "7.0NG.762 Build 220620";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 5c6f848398..75ab7c90b3 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.762 Build 220616";
+my $version = "7.0NG.762 Build 220620";
 
 # save program name for logging
 my $progname = basename($0);