diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index 0a45a18342..d9453eb931 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -563,7 +563,14 @@ if ($search != '') {
     if ($id != '') {
         $aux = $id[0]['id_agent'];
         $search_sql = sprintf(
-            ' AND ( `nombre` LIKE "%%%s%%" OR tagente.id_agente = %d',
+            ' AND ( nombre LIKE "%%%s%%"
+             OR alias LIKE "%%%s%%"
+             OR comentarios LIKE "%%%s%%"
+			 OR EXISTS (SELECT * FROM tagent_custom_data WHERE id_agent = id_agente AND description LIKE "%%%s%%")
+             OR tagente.id_agente = %d',
+            $search,
+            $search,
+            $search,
             $search,
             $aux
         );