diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index a0726a2af6..641719d61e 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-27  Sergio Martin <sergio.martin@artica.es>
+
+	* include/functions_networkmap.php: Performance improvements
+	in networkmaps
+
 2012-11-27  Sergio Martin <sergio.martin@artica.es>
 
 	* godmode/massive/massive_delete_modules.php: Fixed a bug 
diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php
index afa498f1fb..8cb943ae3f 100644
--- a/pandora_console/include/functions_networkmap.php
+++ b/pandora_console/include/functions_networkmap.php
@@ -84,7 +84,8 @@ function networkmap_generate_dot ($pandora_name, $group = 0, $simple = 0,
 	}
 	else {
 		$agents = agents_get_agents ($filter,
-			array ('id_grupo, nombre, id_os, id_parent, id_agente, normal_count, warning_count, critical_count, unknown_count, total_count, notinit_count'));
+			array ('id_grupo, nombre, id_os, id_parent, id_agente, 
+				normal_count, warning_count, critical_count, unknown_count, total_count, notinit_count'));
 	}
 	
 	if ($agents === false)
@@ -277,7 +278,8 @@ function networkmap_generate_dot_groups ($pandora_name, $group = 0, $simple = 0,
 	if ($depth != 'group') {
 		// Get agents data
 		$agents = agents_get_agents ($filter,
-			array ('id_grupo, nombre, id_os, id_agente'));
+			array ('id_grupo, nombre, id_os, id_agente, 
+				normal_count, warning_count, critical_count, unknown_count, total_count, notinit_count'));
 		
 		if ($agents === false)
 			$agents = array();
@@ -490,13 +492,8 @@ function networkmap_create_group_node ($group, $simple = 0, $font_size = 10, $me
 // Returns a node definition
 function networkmap_create_agent_node ($agent, $simple = 0, $font_size = 10, $cut_names = true, $relative = false, $metaconsole = false, $id_server = null) {
 	global $config;
-	
-	if (defined('METACONSOLE')) {
-		$status = agents_get_status_from_counts($agent);
-	}
-	else {
-		$status = agents_get_status($agent['id_agente']);
-	}
+
+	$status = agents_get_status_from_counts($agent);
 	
 	// Set node status
 	switch ($status) {