diff --git a/ui/jsp/snapshot.jsp b/ui/jsp/snapshot.jsp
index cfca394d323..f96d7adb1d0 100644
--- a/ui/jsp/snapshot.jsp
+++ b/ui/jsp/snapshot.jsp
@@ -219,8 +219,12 @@ dictionary = {
             <form action="#" method="post">
             <ol>                
                 <li id="adv_search_domain_li" style="display: none;">
+                    <input class="text textwatermark" type="text" id="domain" value='<fmt:message key="label.by.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;">
                     <input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
diff --git a/ui/jsp/volume.jsp b/ui/jsp/volume.jsp
index daeffb82186..d7263ffbde6 100644
--- a/ui/jsp/volume.jsp
+++ b/ui/jsp/volume.jsp
@@ -778,8 +778,12 @@ dictionary = {
                     </select>
                 </li>
                 <li id="adv_search_domain_li" style="display: none;">
+                    <input class="text textwatermark" type="text" id="domain" value='<fmt:message key="label.by.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;">
                     <input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
diff --git a/ui/scripts/cloud.core.account.js b/ui/scripts/cloud.core.account.js
index 529741613ec..bcb53e1513d 100644
--- a/ui/scripts/cloud.core.account.js
+++ b/ui/scripts/cloud.core.account.js
@@ -134,7 +134,7 @@ function bindAddAccountButton() {
                    
     var $dialogAddAccount = $("#dialog_add_account");
     
-    applyAutoCompleteToDomainField($dialogAddAccount.find("#domain"), "listDomains", "listdomainsresponse", "domain");         
+    applyAutoCompleteToDomainField($dialogAddAccount.find("#domain"));         
     /*   
     $dialogAddAccount.find("#domain").autocomplete({
 		source: function(request, response) {			
diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js
index 193e313080a..30792081485 100644
--- a/ui/scripts/cloud.core.init.js
+++ b/ui/scripts/cloud.core.init.js
@@ -475,7 +475,7 @@ $(document).ready(function() {
 	            }
             	
             	
-            	applyAutoCompleteToDomainField($advancedSearchPopup.find("#domain"), "listDomains", "listdomainsresponse", "domain");         
+            	applyAutoCompleteToDomainField($advancedSearchPopup.find("#domain"));         
                 	
 	            var domainSelect = $advancedSearchPopup.find("#adv_search_domain");	
 	            if(domainSelect.length>0 && $advancedSearchPopup.find("#adv_search_domain_li").css("display")!="none") {	                		
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 25196830e56..c14c47a2d4f 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -1052,7 +1052,7 @@ function getMidmenuId(jsonObj) {
 }
 
 var autoCompleteDomains = [];
-function applyAutoCompleteToDomainField($field, commandString, jsonResponse1, jsonResponse2) {  
+function applyAutoCompleteToDomainField($field) {  
     $field.autocomplete({
 		source: function(request, response) {			
 			$.ajax({
diff --git a/ui/scripts/cloud.core.snapshot.js b/ui/scripts/cloud.core.snapshot.js
index de1410d82ef..c01ef8d0c8d 100644
--- a/ui/scripts/cloud.core.snapshot.js
+++ b/ui/scripts/cloud.core.snapshot.js
@@ -25,12 +25,29 @@ function snapshotGetSearchParams() {
     }     
 
 	var $advancedSearchPopup = getAdvancedSearchPopupInSearchContainer();
-	if ($advancedSearchPopup.length > 0 && $advancedSearchPopup.css("display") != "none" ) {
-        if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none") {		
-		    var domainId = $advancedSearchPopup.find("#adv_search_domain").val();		
-		    if (domainId!=null && domainId.length > 0) 
-			    moreCriteria.push("&domainid="+domainId);	
-    	}	
+	if ($advancedSearchPopup.length > 0 && $advancedSearchPopup.css("display") != "none" ) {                
+        if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none"
+	        && $advancedSearchPopup.find("#domain").hasClass("textwatermark") == false) {
+	        var domainName = $advancedSearchPopup.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, $advancedSearchPopup.find("#domain"), $advancedSearchPopup.find("#domain_errormsg"), g_dictionary["label.not.found"]);
+			    }
+			    else { //e.g. domainId == 5 (number)
+			        showError(true, $advancedSearchPopup.find("#domain"), $advancedSearchPopup.find("#domain_errormsg"), null)
+			        moreCriteria.push("&domainid="+todb(domainId));	
+			    }
+			}
+	    }
     	
 		if ($advancedSearchPopup.find("#adv_search_account_li").css("display") != "none" 
     	    && $advancedSearchPopup.find("#adv_search_account").hasClass("textwatermark") == false) {
diff --git a/ui/scripts/cloud.core.volume.js b/ui/scripts/cloud.core.volume.js
index aca904adce8..5f5cea11826 100644
--- a/ui/scripts/cloud.core.volume.js
+++ b/ui/scripts/cloud.core.volume.js
@@ -30,11 +30,28 @@ function volumeGetSearchParams() {
 	    if (zone!=null && zone.length > 0) 
 			moreCriteria.push("&zoneId="+zone);	
 		        
-        if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none") {		
-		    var domainId = $advancedSearchPopup.find("#adv_search_domain").val();		
-		    if (domainId!=null && domainId.length > 0) 
-			    moreCriteria.push("&domainid="+domainId);	
-    	}	
+        if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none"
+	        && $advancedSearchPopup.find("#domain").hasClass("textwatermark") == false) {
+	        var domainName = $advancedSearchPopup.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, $advancedSearchPopup.find("#domain"), $advancedSearchPopup.find("#domain_errormsg"), g_dictionary["label.not.found"]);
+			    }
+			    else { //e.g. domainId == 5 (number)
+			        showError(true, $advancedSearchPopup.find("#domain"), $advancedSearchPopup.find("#domain_errormsg"), null)
+			        moreCriteria.push("&domainid="+todb(domainId));	
+			    }
+			}
+	    }
     	
 		if ($advancedSearchPopup.find("#adv_search_account_li").css("display") != "none" 
     	    && $advancedSearchPopup.find("#adv_search_account").hasClass("textwatermark") == false) {