diff --git a/ui/jsp/tab_networking.jsp b/ui/jsp/tab_networking.jsp
index 21528a9030d..d0b564d1be0 100755
--- a/ui/jsp/tab_networking.jsp
+++ b/ui/jsp/tab_networking.jsp
@@ -583,9 +583,13 @@ long milliseconds = new Date().getTime();
                         </li>
                         <li id="adv_search_domain_li" style="display: none;">
                             <label for="filter">
-                                Domain:</label>
+                                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.network.js b/ui/scripts/cloud.core.network.js
index 174cb794b6c..de2d703dd4d 100644
--- a/ui/scripts/cloud.core.network.js
+++ b/ui/scripts/cloud.core.network.js
@@ -1174,19 +1174,44 @@ function showNetworkingTab(p_domainId, p_account) {
 	    var commandString;            
 		var advanced = submenuContent.find("#search_button").data("advanced");                    
 		if (advanced != null && advanced) {		
-		    var name = submenuContent.find("#advanced_search #adv_search_name").val();	   
-		    var virtualMachineId = submenuContent.find("#advanced_search #adv_search_vm").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("&networkgroupname="+encodeURIComponent(trim(name)));						
-			if (virtualMachineId!=null && virtualMachineId.length > 0) 
-				moreCriteria.push("&virtualmachineid="+encodeURIComponent(virtualMachineId));	   
-			if (domainId!=null && domainId.length > 0) 
-				moreCriteria.push("&domainid="+domainId);		
-			if (account!=null && account.length > 0) 
-				moreCriteria.push("&account="+account);			
+		    var moreCriteria = [];	
+		    
+		    var name = submenuContent.find("#advanced_search #adv_search_name").val();	  
+		    if (name!=null && trim(name).length > 0) 
+				moreCriteria.push("&networkgroupname="+encodeURIComponent(trim(name)));				
+		     
+		    var virtualMachineId = submenuContent.find("#advanced_search #adv_search_vm").val();
+		    if (virtualMachineId!=null && virtualMachineId.length > 0) 
+				moreCriteria.push("&virtualmachineid="+encodeURIComponent(virtualMachineId));	  
+		    				   
+		    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" 
+			            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=listNetworkGroups&page=" + currentPage + moreCriteria.join("") + "&response=json";		
 		} else {    
 		     var moreCriteria = [];