diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index a6a9ddcc23a..f16b69d3eb3 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -10,7 +10,15 @@ message.download.template=Please click <a href="#">#</a> to download template
 message.download.ISO=Please click <a href="#">#</a> to download ISO    
 message.action.instance.reset.password=Please confirm that you want to change the ROOT password for this virtual machine.   
 label.owner.domain=Owner Domain  
-  
+label.by.type.id=By Type ID
+label.by.zone=By Zone
+label.by.pod=By Pod
+label.by.domain=By Domain
+label.by.account=By Account
+label.by.start.date=By Start Date
+label.by.end.date=By End Date
+
+
 #Labels
 label.account.id=Account ID
 label.account.name=Account Name
diff --git a/ui/index.jsp b/ui/index.jsp
index 558f494ecd5..e7c7b004f3c 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -82,6 +82,10 @@
 		'label.character': '<fmt:message key="label.character"/>',
 		'label.double.quotes.are.not.allowed': '<fmt:message key="label.double.quotes.are.not.allowed"/>',
 		'label.example': '<fmt:message key="label.example"/>',
+		'label.by.zone': '<fmt:message key="label.by.zone"/>', 
+		'label.by.pod': '<fmt:message key="label.by.pod"/>', 
+		'label.by.domain': '<fmt:message key="label.by.domain"/>',
+		'label.by.account': '<fmt:message key="label.by.account"/>'
 	};	
 	</script>
 </head>
diff --git a/ui/jsp/alert.jsp b/ui/jsp/alert.jsp
index 5e134967ff2..a142ff1c7b3 100644
--- a/ui/jsp/alert.jsp
+++ b/ui/jsp/alert.jsp
@@ -98,7 +98,7 @@
             <form action="#" method="post">
             <ol>
                 <li>
-                    <input class="text textwatermark" type="text" id="adv_search_typeid" value="by Type ID" />
+                    <input class="text textwatermark" type="text" id="adv_search_typeid" value='<fmt:message key="label.by.type.id"/>'/>
                 </li>
             </ol>
             </form>
diff --git a/ui/jsp/event.jsp b/ui/jsp/event.jsp
index 0292cf75d5b..2fb98f97090 100644
--- a/ui/jsp/event.jsp
+++ b/ui/jsp/event.jsp
@@ -301,13 +301,13 @@
                     </select>
                 </li>
                 <li id="adv_search_account_li" style="display: none;">
-                    <input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
+                    <input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
                 </li>
                 <li>
-                    <input class="text textwatermark" type="text" id="adv_search_startdate" value="by start date" />
+                    <input class="text textwatermark" type="text" id="adv_search_startdate" value='<fmt:message key="label.by.start.date" />' />
                 </li>
                 <li>
-                    <input class="text textwatermark" type="text" id="adv_search_enddate" value="by end date" />
+                    <input class="text textwatermark" type="text" id="adv_search_enddate" value='<fmt:message key="label.by.end.date" />' />
                 </li>
             </ol>
             </form>
diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp
index a4f5c320a3c..5a92ecea8cd 100644
--- a/ui/jsp/instance.jsp
+++ b/ui/jsp/instance.jsp
@@ -1270,7 +1270,7 @@ dictionary = {
                     </select>
                 </li>
                 <li id="adv_search_account_li" style="display: none;">
-                    <input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
+                    <input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
                 </li>
             </ol>
             </form>
@@ -1289,7 +1289,7 @@ dictionary = {
                     </select>
                 </li>
                 <li id="adv_search_account_li" style="display: none;">                    
-                    <input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
+                    <input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
                 </li>
             </ol>
             </form>
diff --git a/ui/jsp/ipaddress.jsp b/ui/jsp/ipaddress.jsp
index d0509abbd36..99f5571f8de 100644
--- a/ui/jsp/ipaddress.jsp
+++ b/ui/jsp/ipaddress.jsp
@@ -876,7 +876,7 @@ dictionary = {
                     </select>
                 </li>
                 <li id="adv_search_account_li" style="display: none;">
-                    <input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
+                    <input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
                 </li>
             </ol>
             </form>
diff --git a/ui/jsp/iso.jsp b/ui/jsp/iso.jsp
index 6bd54ee6f18..7e9988f5154 100644
--- a/ui/jsp/iso.jsp
+++ b/ui/jsp/iso.jsp
@@ -407,7 +407,7 @@ dictionary = {
                     </select>
                 </li>
                 <li id="adv_search_account_li" style="display: none;">
-                    <input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
+                    <input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
                 </li>
             </ol>
             </form>
diff --git a/ui/jsp/network.jsp b/ui/jsp/network.jsp
index 7451b3480e6..3bafa011d4a 100644
--- a/ui/jsp/network.jsp
+++ b/ui/jsp/network.jsp
@@ -1297,7 +1297,7 @@ dictionary = {
                     </select>
                 </li>
                 <li id="adv_search_account_li" style="display: none;">
-                    <input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
+                    <input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
                 </li>
             </ol>
             </form>
diff --git a/ui/jsp/router.jsp b/ui/jsp/router.jsp
index ec1bd35cb34..f3a259f6b07 100644
--- a/ui/jsp/router.jsp
+++ b/ui/jsp/router.jsp
@@ -235,7 +235,7 @@ dictionary = {
                     </select>
                 </li>
                 <li id="adv_search_account_li" style="display: none;">
-                    <input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
+                    <input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
                 </li>
             </ol>
             </form>
diff --git a/ui/jsp/snapshot.jsp b/ui/jsp/snapshot.jsp
index fb28bd2d084..6e58d359ae4 100644
--- a/ui/jsp/snapshot.jsp
+++ b/ui/jsp/snapshot.jsp
@@ -213,7 +213,7 @@ dictionary = {
                     </select>
                 </li>
                 <li id="adv_search_account_li" style="display: none;">
-                    <input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
+                    <input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
                 </li>
             </ol>
             </form>
diff --git a/ui/jsp/template.jsp b/ui/jsp/template.jsp
index 8bf340e7779..0c581f1daf6 100644
--- a/ui/jsp/template.jsp
+++ b/ui/jsp/template.jsp
@@ -434,7 +434,7 @@ dictionary = {
                     </select>
                 </li>
                 <li id="adv_search_account_li" style="display: none;">
-                    <input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
+                    <input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
                 </li>
             </ol>
             </form>
diff --git a/ui/jsp/volume.jsp b/ui/jsp/volume.jsp
index c2f00e8ea01..8efbce6db3d 100644
--- a/ui/jsp/volume.jsp
+++ b/ui/jsp/volume.jsp
@@ -781,7 +781,7 @@ dictionary = {
                     </select>
                 </li>
                 <li id="adv_search_account_li" style="display: none;">
-                    <input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
+                    <input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
                 </li>
             </ol>
             </form>
diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js
index 368d71406a3..6049623169c 100644
--- a/ui/scripts/cloud.core.init.js
+++ b/ui/scripts/cloud.core.init.js
@@ -403,7 +403,7 @@ $(document).ready(function() {
 		                success: function(json) {
 			                var zones = json.listzonesresponse.zone;			   
 			                zoneSelect.empty();					
-			                zoneSelect.append("<option value=''>by zone</option>"); 
+			                zoneSelect.append("<option value=''>" + g_dictionary["label.by.zone"] + "</option>"); 
 			                if (zones != null && zones.length > 0) {
 			                    for (var i = 0; i < zones.length; i++) {
 				                    zoneSelect.append("<option value='" + zones[i].id + "'>" + fromdb(zones[i].name) + "</option>"); 
@@ -431,7 +431,7 @@ $(document).ready(function() {
 			                        success: function(json) {
 				                        var pods = json.listpodsresponse.pod;	
 				                        podSelect.empty();					                        
-				                        podSelect.append("<option value=''>by pod</option>"); 				                        		            
+				                        podSelect.append("<option value=''>" + g_dictionary["label.by.pod"] + "</option>"); 				                        		            
 				                        if (pods != null && pods.length > 0) {
 				                            for (var i = 0; i < pods.length; i++) {
 					                            podSelect.append("<option value='" + pods[i].id + "'>" + fromdb(pods[i].name) + "</option>"); 
@@ -455,7 +455,7 @@ $(document).ready(function() {
 		                success: function(json) {			        
 			                var domains = json.listdomainsresponse.domain;		
 	                        domainSelect.empty();	
-	                        domainSelect.append("<option value=''>by domain</option>"); 
+	                        domainSelect.append("<option value=''>" + g_dictionary["label.by.domain"] + "</option>"); 
 			                if (domains != null && domains.length > 0) {
 			                    for (var i = 0; i < domains.length; i++) {
 				                    domainSelect.append("<option value='" + domains[i].id + "'>" + fromdb(domains[i].name) + "</option>"); 
@@ -464,27 +464,7 @@ $(document).ready(function() {
 		                }
 	                });		    
 	            } 	
-            	 
-            	/*    	
-	            var vmSelect = $advancedSearchPopup.find("#adv_search_vm");	
-	            if(vmSelect.length>0) {	
-	                $.ajax({
-		                data: createURL("command=listVirtualMachines"),
-		                dataType: "json",
-		                success: function(json) {			        
-			                var items = json.listvirtualmachinesresponse.virtualmachine;				                
-			                vmSelect.empty();		
-	                        vmSelect.append("<option value=''>by instance</option>"); 				                	 
-			                if (items != null && items.length > 0) {
-			                    for (var i = 0; i < items.length; i++) {
-				                    vmSelect.append("<option value='" + items[i].id + "'>" + fromdb(items[i].name) + "</option>"); 
-			                    }
-			                }
-		                }
-	                });		    
-	            } 	  
-        	    */
-        	    	      
+            	   
 	            $advancedSearchPopup.find("#adv_search_startdate, #adv_search_enddate").datepicker({dateFormat: 'yy-mm-dd'});	            
 	        }
 	    }