diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index a91b8e0731..eb01888546 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-23 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* godmode/modules/manage_network_components.php: Removed entities.
+
 2011-11-23 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
 
 	* pandoradb.data.postgreSQL.sql
diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php
index bb43ef143f..1a087d0e98 100644
--- a/pandora_console/godmode/modules/manage_network_components.php
+++ b/pandora_console/godmode/modules/manage_network_components.php
@@ -363,11 +363,11 @@ foreach ($components as $component) {
 	}
 	
 	$data[0] = '<a href="index.php?sec=gmodules&sec2=godmode/modules/manage_network_components&id='.$component['id_nc'].'">';
-	$data[0] .= $component['name'];
+	$data[0] .= io_safe_output($component['name']);
 	$data[0] .= '</a>';
 	$data[1] = ui_print_moduletype_icon ($component['type'], true);
 	$data[2] = $component['module_interval'] ? $component['module_interval'] : __('N/A	');
-	$data[3] = mb_strimwidth ($component['description'], 0, 30, "...");
+	$data[3] = mb_strimwidth (io_safe_output($component['description']), 0, 30, "...");
 	$data[4] = network_components_get_group_name ($component['id_group']);
 	$data[5] = $component['max']." / ".$component['min'];