diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 84d1ca1440..049e97c19b 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,14 @@
+2012-06-12 Miguel de Dios <miguel.dedios@artica.es>
+	
+	* extras/pandoradb_migrate_v3.2_to_v4.0.sql: added the lost
+	semicolons in some standments.
+	
+	* godmode/reporting/visual_console_builder.php: restore the search
+	modules without entities, because there was a bug into the recon
+	server that recode two times the name, now run all parts fine.
+	
+	MERGED FROM 4.0.2
+
 2012-06-12 Dario Rodriguez <dario.rodriguez@artica.es>
 
         * operation/agentes/estado_agente.php: Improved
diff --git a/pandora_console/extras/pandoradb_migrate_v3.2_to_v4.0.sql b/pandora_console/extras/pandoradb_migrate_v3.2_to_v4.0.sql
index 3959da63d2..8e57bba7e2 100644
--- a/pandora_console/extras/pandoradb_migrate_v3.2_to_v4.0.sql
+++ b/pandora_console/extras/pandoradb_migrate_v3.2_to_v4.0.sql
@@ -265,3 +265,9 @@ INSERT INTO `tconfig_os` (`name`, `description`, `icon_name`) VALUES ('VMware',
 UPDATE tconfig SET value='4.0' WHERE token = 'db_scheme_version';
 UPDATE tconfig SET value='PD110923 (3.2 Migrate)' WHERE token = 'db_scheme_build';
 
+
+-- -----------------------------------------------------
+-- Encode empty space entities (Added 17th May 2012)
+-- -----------------------------------------------------
+UPDATE tnetwork_component SET name = REPLACE(name,' ','&#x20;');
+UPDATE tlocal_component SET name = REPLACE(name,' ','&#x20;');
diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php
index 72c5fcdbf9..c717b03c57 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.php
@@ -218,7 +218,7 @@ switch ($activeTab) {
 							foreach ($id_agents as $ag) {
 								$id_module = agents_get_modules($ag,
 									array('id_agente_modulo'),
-									array('nombre' => io_safe_input($mod)));
+									array('nombre' => $mod));
 									
 								if (empty($id_module))
 									continue;