diff --git a/pandora_console/godmode/reporting/cluster_builder.main.php b/pandora_console/godmode/reporting/cluster_builder.main.php
index c96c852353..a5e2aec8ce 100644
--- a/pandora_console/godmode/reporting/cluster_builder.main.php
+++ b/pandora_console/godmode/reporting/cluster_builder.main.php
@@ -32,10 +32,10 @@ else
   echo '<li class="first">';
 
 if ($step > 1 && !$update) {
-  echo '<a href="index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&id_cluster='.$id_cluster.'&step=1">';
+  
   echo __('Step') . ' 1 &raquo; ';
   echo '<span>' . __('Cluster settings') . '</span>';
-  echo '</a>';
+  
 }
 elseif ($update) {
   echo '<a href="index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&id_cluster='.$id_cluster.'&step=1&update=1">';
@@ -481,7 +481,17 @@ elseif ($step == 4) {
     echo "<td class='datos'>".$value."</td>";
     echo "<td class='datos'><input class='zero_hundred' value='".get_item_critical_limit_by_item_id($key)."' name='critical_item_".$key."' type='number' max='100' min='0' style='width:60%;' onkeydown='javascript: return event.keyCode == 69 ? false : true'> &nbsp;&nbsp;% are down</td>";
     echo "<td class='datos'><input class='zero_hundred' value='".get_item_warning_limit_by_item_id($key)."' name='warning_item_".$key."' type='number' max='100' min='0' style='width:60%;' onkeydown='javascript: return event.keyCode == 69 ? false : true'> &nbsp;&nbsp;% are down</td>";
-    echo "<td class='datos'><a href='index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&delete_module_aa=".$key."&id_cluster=".$id_cluster."'><img src='images/cross.png'></a></td>";
+    echo "<td class='datos'>";
+    
+    if(!$update){
+      echo "<a href='index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&delete_module_aa=".$key."&id_cluster=".$id_cluster."'>";
+    }
+    else{
+      echo "<a href='index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&delete_module_aa=".$key."&id_cluster=".$id_cluster."&update=1'>";  
+    }
+    
+    
+    echo "<img src='images/cross.png'></a></td>";
     echo "</tr>";
     
   }
@@ -653,7 +663,14 @@ elseif ($step == 6) {
       echo "<td class='datos'><input class='is_critical_check' name='is_critical_item_".$key."' type='checkbox' value='1'></td>";
     }
     
-    echo "<td class='datos'><a href='index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&delete_module_ap=".$key."&id_cluster=".$id_cluster."'><img src='images/cross.png'></a></td>";
+    if(!$update){
+      echo "<td class='datos'><a href='index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&delete_module_ap=".$key."&id_cluster=".$id_cluster."'><img src='images/cross.png'></a></td>";
+    }
+    else{
+      echo "<td class='datos'><a href='index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&delete_module_ap=".$key."&id_cluster=".$id_cluster."&update=1'><img src='images/cross.png'></a></td>";
+    }
+    
+    
     echo "</tr>";
     
   }
diff --git a/pandora_console/godmode/reporting/cluster_builder.php b/pandora_console/godmode/reporting/cluster_builder.php
index 4d632377f5..bd369ebd2c 100644
--- a/pandora_console/godmode/reporting/cluster_builder.php
+++ b/pandora_console/godmode/reporting/cluster_builder.php
@@ -540,7 +540,14 @@ elseif ($step == 3) {
 		
 		$delete_item = db_process_sql('delete from tcluster_item where id = '.$delete_module_aa);
 		
-		header ("Location: index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&step=4&id_cluster=".$id_cluster);	
+		if(!$update){
+			header ("Location: index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&step=4&id_cluster=".$id_cluster);	
+		}
+		else{
+			header ("Location: index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&step=4&id_cluster=".$id_cluster."&update=1");	
+		}
+		
+		
 	}
 	elseif($delete_module_ap){
 		
@@ -550,7 +557,13 @@ elseif ($step == 3) {
 		
 		$delete_item = db_process_sql('delete from tcluster_item where id = '.$delete_module_ap);
 		
-		header ("Location: index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&step=6&id_cluster=".$id_cluster);		
+		if(!$update){
+			header ("Location: index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&step=6&id_cluster=".$id_cluster);			
+		}
+		else{
+			header ("Location: index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&step=6&id_cluster=".$id_cluster."&update=1");
+		}
+		
 	}
 
 $active_tab = get_parameter('tab', 'main');
diff --git a/pandora_console/godmode/reporting/cluster_list.php b/pandora_console/godmode/reporting/cluster_list.php
index 11512597ff..90bf826f9e 100644
--- a/pandora_console/godmode/reporting/cluster_list.php
+++ b/pandora_console/godmode/reporting/cluster_list.php
@@ -51,16 +51,16 @@ ui_pagination (count($clusters));
 	
 	
   $table->head[4] = __('Nodes') . ' ' . 
-	'<a href="index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=name&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp, "alt" => "up"))  . '</a>' .
-	'<a href="index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=name&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . '</a>';
+	'<a href="index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=nodes&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp, "alt" => "up"))  . '</a>' .
+	'<a href="index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=nodes&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . '</a>';
   
 	$table->head[5] = __('Status') . ' ' . 
-	'<a href="index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=name&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp, "alt" => "up"))  . '</a>' .
-	'<a href="index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=name&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . '</a>';
+	'<a href="index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=status&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp, "alt" => "up"))  . '</a>' .
+	'<a href="index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=status&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . '</a>';
   
   $table->head[6] = __('Actions') . ' ' . 
 	'<a href="index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=actions&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp, "alt" => "up"))  . '</a>' .
-	'<a href="index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=action&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . '</a>';
+	'<a href="index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=actions&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . '</a>';
   
 	$table->size[0] = '25%';
   $table->size[1] = '25%';
diff --git a/pandora_console/godmode/reporting/cluster_view.php b/pandora_console/godmode/reporting/cluster_view.php
index 8db5783fb3..bb7aa81931 100644
--- a/pandora_console/godmode/reporting/cluster_view.php
+++ b/pandora_console/godmode/reporting/cluster_view.php
@@ -402,9 +402,18 @@ function pagination_list_modules() {
 			
 			$("#module_list").empty();
 			$("#module_list").html(data);
+			
+			//hide filters
+			
 			$('.forced_title[alt=Force]').css('display','none');
+			$('.header a').css('display','none');
+			
+			//hide filters
+			
 		}
 	});
+	
+	
 }
 
 $("a.tag_details").cluetip ({