diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 5616eea70f..944d86b88d 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,11 @@
+2011-09-22  Sergio Martin <sergio.martin@artica.es>
+
+	* extras/pandoradb_migrate_v3.2_to_v4.0.sql: Deleted
+	duplicated line
+
+	* godmode/reporting/reporting_builder.php: Fixed report graph
+	insertion of id 0 in the reports for bugs 3412316 and 3412866 
+
 2011-09-22 Miguel de Dios  <miguel.dedios@artica.es>
 	
 	* include/functions_api.php: replaced the anonymous function for the named
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 e4f108f9a9..48240c3101 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
@@ -199,8 +199,6 @@ ALTER TABLE `tnetwork_map` ADD COLUMN `show_snmp_modules` TINYINT(1) UNSIGNED  N
 -- Table `trecon_task`
 -- -----------------------------------------------------
 
-ALTER TABLE `trecon_task` ADD COLUMN `disabled` tinyint(1) UNSIGNED NOT NULL DEFAULT 0;
-
 ALTER TABLE `trecon_task` ADD COLUMN `disabled` tinyint(1) UNSIGNED NOT NULL DEFAULT 0;
 ALTER TABLE `trecon_task` ADD COLUMN `os_detect` tinyint(1) unsigned default '0';
 ALTER TABLE `trecon_task` ADD COLUMN `resolve_names` tinyint(1) unsigned default '0';
@@ -256,9 +254,6 @@ ALTER TABLE ttrap ADD INDEX status (`status`);
 ALTER TABLE `talert_snmp` MODIFY COLUMN `custom_oid` text DEFAULT '';
 
 
-ALTER TABLE ttrap ADD INDEX timestamp (`timestamp`);
-
-
 -- -----------------------------------------------------
 -- Table `tconfig_os`
 -- -----------------------------------------------------
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index 90d12a68e6..b42972382a 100644
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -317,7 +317,7 @@ switch ($action) {
 							break;
 						}
 						$id_gs = substr ($values['id_gs'], 0, strpos ($values['id_gs'], '|'));
-						if ($id_gs !== false) {
+						if ($id_gs !== false && $id_gs !== '') {
 							$server_name = strstr($values ['id_gs'], '|');
 							$values ['id_gs'] = $id_gs;
 							$values['server_name'] = substr ($server_name, 1, strlen($server_name));