diff --git a/ui/scripts/cloud.core.alert.js b/ui/scripts/cloud.core.alert.js
index 88a06685757..ae5ff79737d 100644
--- a/ui/scripts/cloud.core.alert.js
+++ b/ui/scripts/cloud.core.alert.js
@@ -19,18 +19,17 @@
 function alertGetSearchParams() {
     var moreCriteria = [];	
 
+    var searchInput = $("#basic_search").find("#search_input").val();	 
+    if (searchInput != null && searchInput.length > 0) {	           
+        moreCriteria.push("&keyword="+todb(searchInput));	       
+    }     
+
 	var $advancedSearchPopup = $("#advanced_search_popup");
 	if (lastSearchType == "advanced_search" && $advancedSearchPopup.length > 0) {
 	    var type = $advancedSearchPopup.find("#adv_search_type").val();							
 		if (type!=null && type.length > 0) 
 			moreCriteria.push("&type="+todb(type));			
-	} 
-	else {     			    		
-	    var searchInput = $("#basic_search").find("#search_input").val();	 
-        if (lastSearchType == "basic_search" && searchInput != null && searchInput.length > 0) {	           
-            moreCriteria.push("&keyword="+todb(searchInput));	       
-        }        
-	}
+	} 	
 	
 	return moreCriteria.join("");          
 }
diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js
index d08c10d4fc8..35f95c01948 100644
--- a/ui/scripts/cloud.core.init.js
+++ b/ui/scripts/cloud.core.init.js
@@ -266,6 +266,7 @@ $(document).ready(function() {
 	                lastSearchType = "advanced_search";  
 	                //$("#basic_search").find("#search_input").val("");
 	                listMidMenuItems2(params.commandString, params.getSearchParamsFn, params.jsonResponse1, params.jsonResponse2, params.toMidmenuFn, params.toRightPanelFn, params.getMidmenuIdFn, params.isMultipleSelectionInMidMenu, 1);
+    	            $("#advanced_search_icon").removeClass("on");
     	            $(this).hide();
 	                return false;
 	            }