diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 756284fbf3..16a00fbd24 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-07  Sergio Martin <sergio.martin@artica.es>
+
+	* godmode/groups/group_list.php: Added code for get agent filter
+	from policy agents view
+
 2011-07-07 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
 
 	* include/functions_graph.php: Fixed graphs on Visual console.
diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php
index 240f60aa7d..ac6d64acb2 100644
--- a/pandora_console/godmode/groups/group_list.php
+++ b/pandora_console/godmode/groups/group_list.php
@@ -64,6 +64,8 @@ if (is_ajax ()) {
 	if ($get_group_agents) {
 		$id_group = (int) get_parameter ('id_group');
 		$disabled = (int) get_parameter ('disabled', 0);
+		$search = (string) get_parameter ('search', '');
+		$keycount = (int) get_parameter ('keycount', 0);
 		
 		if (! check_acl ($config['id_user'], $id_group, "AR")) {
 			db_pandora_audit("ACL Violation",
@@ -72,7 +74,15 @@ if (is_ajax ()) {
 			return;
 		}
 		
-		echo json_encode (agents_get_group_agents ($id_group, array('disabled' => $disabled), "none"));
+		$filter['disabled'] = $disabled;
+		
+		if($search != '') {
+			$filter['string'] = $search;
+		}
+			
+		$agents['keycount'] = $keycount;
+		$agents = $agents + agents_get_group_agents ($id_group, $filter, "none");
+		echo json_encode ($agents);
 		return;
 	}