diff --git a/ui/jsp/ipaddress.jsp b/ui/jsp/ipaddress.jsp
index e3ec641812c..2fabc7d6bf7 100644
--- a/ui/jsp/ipaddress.jsp
+++ b/ui/jsp/ipaddress.jsp
@@ -673,3 +673,44 @@
 <!-- Enable Static NAT Dialog (end) -->
 
 <!--  dialogs (end) -->
+
+
+<!-- advanced search template (begin) -->
+<div id="advanced_search_template" class="adv_searchpopup" style="display: none;">
+    <div class="adv_searchformbox">
+        <h3>
+            Advance Search</h3>
+        <a id="advanced_search_close" href="#">Close </a>
+        <form action="#" method="post">
+        <ol>
+            <li>
+                <label for="filter">
+                    IP:</label>
+                <input class="text" type="text" name="adv_search_name" id="adv_search_ipaddress" />
+            </li>
+            <li>
+                <label for="filter">
+                    Zone:</label>
+                <select class="select" id="adv_search_zone">
+                </select>
+            </li>            
+            <li id="adv_search_domain_li" style="display: none;">
+                <label for="filter">
+                    Domain:</label>
+                <select class="select" id="adv_search_domain">
+                </select>
+            </li>
+            <li id="adv_search_account_li" style="display: none;">
+                <label for="filter">
+                    Account:</label>
+                <input class="text" type="text" id="adv_search_account" />
+            </li>
+        </ol>
+        </form>
+        <div class="adv_search_actionbox">
+            <div class="adv_searchpopup_button" id="adv_search_button">
+            </div>
+        </div>
+    </div>
+</div>
+<!-- advanced search template (end) -->
diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js
index a68008d246c..cba1bd11db5 100644
--- a/ui/scripts/cloud.core.ipaddress.js
+++ b/ui/scripts/cloud.core.ipaddress.js
@@ -16,8 +16,39 @@
  * 
  */
 
-function ipGetSearchParams() {
-    return "";
+function ipGetSearchParams() {
+    var moreCriteria = [];	
+
+	var $advancedSearchPopup = $("#advanced_search_popup");
+	if (lastSearchType == "advanced_search" && $advancedSearchPopup.length > 0) {
+	    var ipaddress = $advancedSearchPopup.find("#adv_search_ipaddress").val();							
+		if (ipaddress!=null && trim(ipaddress).length > 0) 
+			moreCriteria.push("&ipaddress="+todb(ipaddress));	
+		
+		var zone = $advancedSearchPopup.find("#adv_search_zone").val();	
+	    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_account_li").css("display") != "none") {	
+		    var account = $advancedSearchPopup.find("#adv_search_account").val();		
+		    if (account!=null && account.length > 0) 
+			    moreCriteria.push("&account="+account);		
+		}	
+	} 
+	else {     			    		
+	    var searchInput = $("#basic_search").find("#search_input").val();	 
+        if (lastSearchType == "basic_search" && searchInput != null && searchInput.length > 0) {	           
+            moreCriteria.push("&ipaddress="+todb(searchInput));	       
+        }        
+	}
+	
+	return moreCriteria.join("");          
 }
 
 function afterLoadIpJSP() {