diff --git a/pandora_console/operation/events/events.build_query.php b/pandora_console/operation/events/events.build_query.php
index 28280d359e..cb2d604a35 100755
--- a/pandora_console/operation/events/events.build_query.php
+++ b/pandora_console/operation/events/events.build_query.php
@@ -121,8 +121,8 @@ if ($severity != -1) {
 
 // In metaconsole mode the agent search is performed by name
 if ($meta) {
-	$filter_resume['agent'] = $text_agent;
-	if ($text_agent != __('All')) {
+	if (($text_agent != __('All')) && ($text_agent !== '')) {
+		$filter_resume['agent'] = $text_agent;
 		$sql_post .= " AND agent_name LIKE '%$text_agent%'";
 	}
 }
diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index 424fbedfd6..3788628657 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -734,7 +734,8 @@ enterprise_hook('print_event_tags_active_filters',
 			'event_type' => $types,
 			'severity' => $severities,
 			'duplicate' => $repeated_sel,
-			'alerts' => $alert_events_titles)
+			'alerts' => $alert_events_titles,
+			'groups' => users_get_groups_for_select($config["id_user"], $access, true, true, false))
 	)
 );