diff --git a/ui/index.jsp b/ui/index.jsp
index 0e069badedc..feb1a7451e1 100755
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -48,9 +48,7 @@ long milliseconds = new Date().getTime();
 	<script type="text/javascript" src="scripts/cloud.logger.js?t=<%=milliseconds%>"></script>
 	<script type="text/javascript" src="scripts/cloud.core.js?t=<%=milliseconds%>"></script>
 	<script type="text/javascript" src="scripts/cloud.core.init.js?t=<%=milliseconds%>"></script>
-		
-	<script type="text/javascript" src="scripts/cloud.core.configuration.js?t=<%=milliseconds%>"></script>	
-		
+				
 	<!-- Favicon -->
 	<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
 	
diff --git a/ui/jsp/tab_configuration.jsp b/ui/jsp/tab_configuration.jsp
index 9026308d54b..379efb5cdf9 100755
--- a/ui/jsp/tab_configuration.jsp
+++ b/ui/jsp/tab_configuration.jsp
@@ -2,9 +2,7 @@
 <%
 long milliseconds = new Date().getTime();
 %>
-<!--  
 <script type="text/javascript" src="scripts/cloud.core.configuration.js?t=<%=milliseconds%>"></script>
--->
 	
 <!-- Content Panel -->
 <!-- Submenu -->
diff --git a/ui/jsp/tab_instances.jsp b/ui/jsp/tab_instances.jsp
index 92678b336b2..6f32ba986a0 100755
--- a/ui/jsp/tab_instances.jsp
+++ b/ui/jsp/tab_instances.jsp
@@ -78,8 +78,12 @@ long milliseconds = new Date().getTime();
                         <li id="adv_search_domain_li" style="display: none;">
                             <label for="filter">
                                 Domain:</label>
+                            <input class="text" type="text" id="domain" />
+		                	<div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+		                    <!--  
                             <select class="select" id="adv_search_domain">
                             </select>
+                            -->
                         </li>
                         <li id="adv_search_account_li" style="display: none;">
                             <label for="filter">
diff --git a/ui/scripts/cloud.core.instances.js b/ui/scripts/cloud.core.instances.js
index 8bc42046ea1..a6c0e18bb33 100644
--- a/ui/scripts/cloud.core.instances.js
+++ b/ui/scripts/cloud.core.instances.js
@@ -1767,25 +1767,56 @@ function showInstancesTab(p_domainId, p_account) {
         var commandString;            
 		var advanced = submenuContent.find("#search_button").data("advanced");                    
 		if (advanced != null && advanced) {		
+		    var moreCriteria = [];	
+		    	
 		    var name = submenuContent.find("#advanced_search #adv_search_name").val();	
+		    if (name!=null && trim(name).length > 0) 
+				moreCriteria.push("&name="+encodeURIComponent(trim(name)));			
+				
 		    var state = submenuContent.find("#advanced_search #adv_search_state").val();
+		    if (state!=null && state.length > 0) 
+				moreCriteria.push("&state="+state);	
+		    
 		    var zone = submenuContent.find("#advanced_search #adv_search_zone").val();
-		    var pod = submenuContent.find("#advanced_search #adv_search_pod").val();
-		    var domainId = submenuContent.find("#advanced_search #adv_search_domain").val();
-		    var account = submenuContent.find("#advanced_search #adv_search_account").val();
-		    var moreCriteria = [];								
-			if (name!=null && trim(name).length > 0) 
-				moreCriteria.push("&name="+encodeURIComponent(trim(name)));				
-			if (state!=null && state.length > 0) 
-				moreCriteria.push("&state="+state);		
 		    if (zone!=null && zone.length > 0) 
 				moreCriteria.push("&zoneid="+zone);		
-		    if (domainId!=null && domainId.length > 0) 
-				moreCriteria.push("&domainid="+domainId);		
-		    if (pod!=null && pod.length > 0) 
-				moreCriteria.push("&podId="+pod);		
-			if (account!=null && account.length > 0) 
-				moreCriteria.push("&account="+account);		       
+			
+			if (submenuContent.find("#adv_search_pod_li").css("display") != "none") {	
+		        var pod = submenuContent.find("#advanced_search #adv_search_pod").val();
+		        if (pod!=null && pod.length > 0) 
+				    moreCriteria.push("&podId="+pod);
+	        }
+		    
+		    //var domainId = submenuContent.find("#advanced_search #adv_search_domain").val();		
+		    debugger;    
+		    if (submenuContent.find("#adv_search_domain_li").css("display") != "none") {
+	            var domainName = submenuContent.find("#domain").val();
+	            if (domainName != null && domainName.length > 0) { 	
+				    var domainId;							    
+			        if(autoCompleteDomains != null && autoCompleteDomains.length > 0) {									
+				        for(var i=0; i < autoCompleteDomains.length; i++) {					        
+				          if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) {
+				              domainId = autoCompleteDomains[i].id;
+				              break;	
+				          }
+			            } 					   			    
+			        } 	     	
+	                if(domainId == null) { 
+			            showError(false, submenuContent.find("#domain"), submenuContent.find("#domain_errormsg"), g_dictionary["label.not.found"]);
+			        }
+			        else { //e.g. domainId == 5 (number)
+			            showError(true, submenuContent.find("#domain"), submenuContent.find("#domain_errormsg"), null)
+			            moreCriteria.push("&domainid="+todb(domainId));	
+			        }
+			    }
+	        }   
+	       
+	        if (submenuContent.find("#adv_search_account_li").css("display") != "none") {    
+		        var account = submenuContent.find("#advanced_search #adv_search_account").val();
+			    if (account!=null && account.length > 0) 
+				    moreCriteria.push("&account="+account);		 
+	        }   
+				   
 			commandString = "command=listVirtualMachines&page="+currentPage+moreCriteria.join("")+"&response=json";
 		} else {     			    		
 		    var searchInput = submenuContent.find("#search_input").val();	 
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index d7ed49c933c..9c83b8c2b7f 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -315,6 +315,10 @@ function submenuContentEventBinder(submenuContent, listFunction) {
 		    }
 		}
     	
+    	
+    	
+    	applyAutoCompleteToDomainField(submenuContent.find("#advanced_search #domain")); 
+    	
     	var domainSelect = submenuContent.find("#advanced_search #adv_search_domain");	
 		if(domainSelect.length>0 && isAdmin()) {
 		    var domainSelect = domainSelect.empty();			
@@ -330,7 +334,8 @@ function submenuContentEventBinder(submenuContent, listFunction) {
 				    }
 			    }
 		    });		    
-		} 	
+		} 
+			
     	    	
     	var vmSelect = submenuContent.find("#advanced_search").find("#adv_search_vm");	
 		if(vmSelect.length>0) {