diff --git a/pandora_console/include/class/Tree.class.php b/pandora_console/include/class/Tree.class.php
index d28910ba58..69080b60fe 100644
--- a/pandora_console/include/class/Tree.class.php
+++ b/pandora_console/include/class/Tree.class.php
@@ -628,7 +628,7 @@ class Tree {
 				return $children;
 			}
 
-			function __getProcessedItem($itemKey, &$items) {
+			function __getProcessedItem($itemKey, &$items, $server_id = false) {
 				if (!isset($items[$itemKey])) {
 					return false;
 				}
@@ -642,6 +642,10 @@ class Tree {
 				$processed_item['name'] = $item['_name_'];
 				$processed_item['searchChildren'] = 1;
 
+				if (defined ('METACONSOLE') && $server_id) {
+					$processed_item['server_id'] = $server_id;
+				}
+
 				if (isset($item['_is_tag_']) && $item['_is_tag_']) {
 					$processed_item['type'] = 'tag';
 				}
@@ -715,7 +719,7 @@ class Tree {
 						if (empty($item['_parent_id_']))
 							$processed_items[] = __getProcessedItem($key, $items);
 					}
-					$item_list[$server['id']] = $processed_items;
+					$item_list += $processed_items;
 
 					metaconsole_restore_db();
 				}