diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 92053f2960..9873db6d76 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+
+2011-05-09 Vanessa Gil <vanessa.gil@artica.es>
+
+	*  operation/agentes/estado_agente.php: Fixed a mistake of my last 
+	commit.
+
+
 2011-05-09 Javier Lanz <javier.lanz@artica.es>
 
 	* include/graphs/fgraph.php: Added 'period' parameter to slicesbar_graph
@@ -36,6 +43,7 @@
 	* pandoradb.postgreSQL.sql: fixed the type of cell "id_agente_modulo" in the
 	table "tagente_datos_string".
 
+>>>>>>> .r4322
 2011-05-06  Dario Rodriguez <dario.rodriguez@artica.es>
 
 	* include/graphs/functions_gd.php: Added new parameter to function
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index f966e689cf..7a345cef3b 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -237,6 +237,11 @@ switch ($sortField) {
 		break;
 }
 
+$search_sql = '';
+if ($search != ""){
+	$search_sql = " AND ( nombre COLLATE utf8_general_ci LIKE '%$search%' OR direccion LIKE '%$search%') ";
+}
+
 // Show only selected groups	
 if ($group_id > 0) {
 	$groups = $group_id;