diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js
index 9461be407ae..b9605b6a942 100644
--- a/ui/scripts/cloud.core.init.js
+++ b/ui/scripts/cloud.core.init.js
@@ -261,34 +261,22 @@ $(document).ready(function() {
 	    }		    
 	});
 	
-	//advanced search	
-    var LeftMenuAdvancedSearchMap = {
-        "leftmenu_instances_my_instances": "advanced_search_popup_nodomainaccount",
-        "leftmenu_instances_running_instances": "advanced_search_popup_nostate",
-        "leftmenu_instances_stopped_instances": "advanced_search_popup_nostate",
-        "leftmenu_instances_destroyed_instances": "advanced_search_popup_nostate"
-    }	
-		
+	//advanced search	   
 	$("#advanced_search_icon").unbind("click").bind("click", function(event) {
 	    if($(this).hasClass("up")) {  //clicking up-arrow          
-	        $("#advanced_search_container").find("#advanced_search_popup").slideUp("500");
+	        getAdvancedSearchPopupInSearchContainer().slideUp("500");
 	        $(this).removeClass("up");	//change arrow from up to down
 	    }
 	    else {  //clicking down-arrow 
 	        $(this).addClass("up");	    //change arrow from down to up
-	          
-	        if($("#advanced_search_container").find("#advanced_search_popup").length > 0) {
-	            $("#advanced_search_container").find("#advanced_search_popup").slideDown("500");
+	         	              
+	        if(getAdvancedSearchPopupInSearchContainer().length > 0) {
+	            getAdvancedSearchPopupInSearchContainer().slideDown("500");
 	        }
-	        else {		            
-	            var $advancedSearchPopup;
-	            if(currentLeftMenuId in LeftMenuAdvancedSearchMap)
-	                $advancedSearchPopup = $("#hidden_container").find("#"+LeftMenuAdvancedSearchMap[currentLeftMenuId]);
-	            else
-	                $advancedSearchPopup = $("#hidden_container").find("#advanced_search_popup");  //default
-	                
-	            $("#advanced_search_container").append($advancedSearchPopup.slideDown("500"));	 
-        	    
+	        else {	
+	            var $advancedSearchPopup = getAdvancedSearchPopupInHiddenContainer();
+	            $advancedSearchPopup.slideDown("500").appendTo($("#advanced_search_container"));
+	            	                    	    
 	            $advancedSearchPopup.unbind("click").bind("click", function(event) {
 	                var $target = $(event.target);
 	                var targetId = $target.attr("id");              	                
diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js
index c677a20df9e..a248fa5dec7 100644
--- a/ui/scripts/cloud.core.instance.js
+++ b/ui/scripts/cloud.core.instance.js
@@ -136,24 +136,7 @@ function afterLoadInstanceJSP() {
     initDialog("dialog_confirmation_restore_vm");    
     initDialog("dialog_confirmation_start_router");
     initDialog("dialog_confirmation_stop_router");
-    initDialog("dialog_confirmation_reboot_router");
-    
-    //customize advanced search 
-    switch(currentLeftMenuId) {
-        case "leftmenu_instances_my_instances":
-            $("#advanced_search_template_nodomainaccount").attr("id", "advanced_search_template");
-            break;
-            
-        case "leftmenu_instances_running_instances":
-        case "leftmenu_instances_stopped_instances":
-        case "leftmenu_instances_destroyed_instances":
-            $("#advanced_search_template_nostate").attr("id", "advanced_search_template");
-            break;
-            
-        default:
-            $("#advanced_search_template_general").attr("id", "advanced_search_template");
-            break;
-    }
+    initDialog("dialog_confirmation_reboot_router");    
 }
 
 function bindStartVMButton() {    
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index cab5718986c..08632c95c9d 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -552,13 +552,38 @@ function setBooleanEditField(value, $field) {
         $field.hide();
 }
 
+ var LeftMenuAdvancedSearchMap = {
+    "leftmenu_instances_my_instances": "advanced_search_popup_nodomainaccount",
+    "leftmenu_instances_running_instances": "advanced_search_popup_nostate",
+    "leftmenu_instances_stopped_instances": "advanced_search_popup_nostate",
+    "leftmenu_instances_destroyed_instances": "advanced_search_popup_nostate"
+}			
+
+function getAdvancedSearchPopup($container) {
+    var $advancedSearchPopup;    
+    if(currentLeftMenuId in LeftMenuAdvancedSearchMap)
+        $advancedSearchPopup = $container.find("#"+LeftMenuAdvancedSearchMap[currentLeftMenuId]);
+    else
+        $advancedSearchPopup = $container.find("#advanced_search_popup");  //default
+    return $advancedSearchPopup;
+}
+
+function getAdvancedSearchPopupInHiddenContainer() {
+    return getAdvancedSearchPopup($("#hidden_container"));
+}
+
+function getAdvancedSearchPopupInSearchContainer() {
+    return getAdvancedSearchPopup($("#advanced_search_container"));
+}
+
 function clearMiddleMenu() {
     $("#midmenu_container").empty();
-    $("#midmenu_action_link").hide();    
-    lastSearchType = null;
+    $("#midmenu_action_link").hide();       
     $("#basic_search").find("#search_input").val("");
     $("#advanced_search_icon").removeClass("up");    
-    $("#advanced_search_container").find("#advanced_search_popup").hide().appendTo($("#hidden_container"));    
+       
+	getAdvancedSearchPopupInSearchContainer().hide().appendTo($("#hidden_container"));                     
+    
     $("#midmenu_prevbutton, #midmenu_nextbutton").hide();
     $("#middle_menu_pagination").data("params", null);
 }