diff --git a/pandora_console/general/firts_task/cluster_builder.php b/pandora_console/general/firts_task/cluster_builder.php
index eb2e8d0e71..dc1e1a3ea3 100644
--- a/pandora_console/general/firts_task/cluster_builder.php
+++ b/pandora_console/general/firts_task/cluster_builder.php
@@ -49,8 +49,17 @@ ui_print_info_message ( array('no_close'=>true, 'message'=>  __('There are no cl
     echo __('<b>Clusters to guarantee service</b>: these are active - passive (A/P) mode clusters. It means that one of the nodes (or machines that make up the cluster) will be running (primary) and another won\'t (secondary). When the primary goes down, the secondary must take over and give the service instead. Although many of the elements of this cluster are active-passive, it will also have active elements in both of them that indicate that the passive node is "online", so that in the case of a service failure in the master, the active node collects this information.');
     
     ?></p>
+		
+		<?php
+		if(check_acl ($config['id_user'], 0, "AW")) {
+		?>
+		
 		<form action="index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&step=1" method="post">
 			<input style="margin-bottom:20px;" type="submit" class="button_task" value="<?php echo __('Create Cluster'); ?>" />
 		</form>
+		
+		<?php
+			}
+		?>
 	</div>
 </div>
\ No newline at end of file
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 52aa90b1f5..5df97acf9d 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -2736,7 +2736,7 @@ function reporting_network_interfaces_report($report, $content, $type = 'dinamic
 				}
 				else{
 					$network_interfaces_by_agents = agents_get_network_interfaces(false, $filter);
-					$return = agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report);
+					$return = agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report, $fullscale);
 					metaconsole_restore_db();
 				}
 			}
@@ -2744,13 +2744,13 @@ function reporting_network_interfaces_report($report, $content, $type = 'dinamic
 	}
 	else{
 		$network_interfaces_by_agents = agents_get_network_interfaces(false, $filter);
-		$return = agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report);
+		$return = agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report, $fullscale);
 	}
 
 	return reporting_check_structure_content($return);
 }
 
-function agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report){
+function agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report, $fullscale){
 	if (empty($network_interfaces_by_agents)) {
 		$return['failed'] =
 			__('The group has no agents or none of the agents has any network interface');
diff --git a/pandora_console/include/javascript/functions_pandora_networkmap.js b/pandora_console/include/javascript/functions_pandora_networkmap.js
index 8fc943835c..491f927cc8 100644
--- a/pandora_console/include/javascript/functions_pandora_networkmap.js
+++ b/pandora_console/include/javascript/functions_pandora_networkmap.js
@@ -943,11 +943,11 @@ function load_interfaces(selected_links) {
 				}
 			}
 		});
-
+		
 		$("#relations_table-template_row-node_source", template_relation_row)
-			.html(link_each.source['raw_text']);
+			.html(link_each.source['raw_text'] != 'undefined' ? link_each.source['text'] : link_each.source['raw_text']);
 		$("#relations_table-template_row-node_target", template_relation_row)
-			.html(link_each.target['raw_text']);
+			.html(link_each.target['raw_text'] != 'undefined' ? link_each.target['text'] : link_each.target['raw_text']);
 		$("#relations_table-template_row-edit", template_relation_row)
 			.attr("align", "center");
 		$("#relations_table-template_row-edit .delete_icon", template_relation_row)
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 3f8c71bed9..5904eb60c1 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -126,8 +126,9 @@ sub help_screen{
 	help_screen_line('--clean_conf_file', '<agent_name>', "Clean a local conf of a given agent deleting all modules, \n\t  policies, file collections and comments");
 	help_screen_line('--get_bad_conf_files', '', 'Get the files bad configured (without essential tokens)');
 	help_screen_line('--locate_agent', '<agent_name>', 'Search a agent into of nodes of metaconsole. Only Enterprise.');
-	help_screen_line('--migration_agent_queue', '<id_agent> <source_node_name> <target_node_name> [<db_only>]', 'Migrate agent only metaconsole');
-	help_screen_line('--migration_agent', '<id_agent> ', 'Is migrating the agent only metaconsole');
+	help_screen_line('--migration_agent_queue', '<id_node> <source_node_name> <target_node_name> [<db_only>]', 'Migrate agent only metaconsole');
+	help_screen_line('--migration_agent', '<id_node> ', 'Is migrating the agent only metaconsole');
+	help_screen_line('--apply_module_template', '<id_template> <id_agent>', 'Apply module template to agent');	
 	print "\nMODULES:\n\n" unless $param ne '';
 	help_screen_line('--create_data_module', "<module_name> <module_type> <agent_name> [<description> <module_group> \n\t  <min> <max> <post_process> <interval> <warning_min> <warning_max> <critical_min> <critical_max> \n\t <history_data> <definition_file> <warning_str> <critical_str>\n\t  <unknown_events> <ff_threshold> <each_ff> <ff_threshold_normal>\n\t  <ff_threshold_warning> <ff_threshold_critical> <ff_timeout> <warning_inverse> <critical_inverse>\n\t <critical_instructions> <warning_instructions> <unknown_instructions>]", 'Add data server module to agent');
 	help_screen_line('--create_web_module', "<module_name> <module_type> <agent_name> [<description> <module_group> \n\t  <min> <max> <post_process> <interval> <warning_min> <warning_max> <critical_min> <critical_max> \n\t <history_data> <definition_file> <warning_str> <critical_str>\n\t  <unknown_events> <ff_threshold> <each_ff> <ff_threshold_normal>\n\t  <ff_threshold_warning> <ff_threshold_critical> <ff_timeout> <warning_inverse> <critical_inverse>\n\t <critical_instructions> <warning_instructions> <unknown_instructions>].\n\t The valid data types are web_data, web_proc, web_content_data or web_content_string", 'Add web server module to agent');