diff --git a/ui/jsp/account.jsp b/ui/jsp/account.jsp
index 3807397db3e..7bd95882616 100644
--- a/ui/jsp/account.jsp
+++ b/ui/jsp/account.jsp
@@ -778,7 +778,7 @@
 
 <!-- advanced search template (begin) -->
 
-<div class="adv_searchpopup_bg" id="advanced_search_template" style="display:none;">
+<div class="adv_searchpopup_bg" id="advanced_search_popup" style="display:none;">
             <div class="adv_searchformbox">
                 <form action="#" method="post">
                 <ol>
diff --git a/ui/jsp/alert.jsp b/ui/jsp/alert.jsp
index e56b7423dc3..e03d4c30025 100644
--- a/ui/jsp/alert.jsp
+++ b/ui/jsp/alert.jsp
@@ -84,7 +84,7 @@
 
 
 <!-- advanced search template (begin) -->
-<div id="advanced_search_template" class="adv_searchpopup_bg" style="display: none;">
+<div id="advanced_search_popup" class="adv_searchpopup_bg" style="display: none;">
     	<div class="adv_searchformbox">
             <form action="#" method="post">
             <ol>
diff --git a/ui/jsp/diskoffering.jsp b/ui/jsp/diskoffering.jsp
index 15f666ba681..aaddfd5fe74 100644
--- a/ui/jsp/diskoffering.jsp
+++ b/ui/jsp/diskoffering.jsp
@@ -213,7 +213,7 @@
 </div>
 
 <!-- advanced search template (begin) -->
-<div class="adv_searchpopup_bg" id="advanced_search_template" style="display:none;">
+<div class="adv_searchpopup_bg" id="advanced_search_popup" style="display:none;">
             <div class="adv_searchformbox">
                 <form action="#" method="post">
                 <ol>
diff --git a/ui/jsp/host.jsp b/ui/jsp/host.jsp
index 264989eecff..ca869501d6c 100644
--- a/ui/jsp/host.jsp
+++ b/ui/jsp/host.jsp
@@ -1064,7 +1064,7 @@
 
 
 <!-- advanced search template (begin) -->
-<div class="adv_searchpopup_bg" id="advanced_search_template" style="display:none;">
+<div class="adv_searchpopup_bg" id="advanced_search_popup" style="display:none;">
             <div class="adv_searchformbox">
                 <form action="#" method="post">
                 <ol>
diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp
index 570a4e45926..a37fb9dbdef 100644
--- a/ui/jsp/instance.jsp
+++ b/ui/jsp/instance.jsp
@@ -1489,7 +1489,7 @@
 <!--  ***** Dialogs (end) ***** -->
 
 <!-- advanced search templates (begin) -->
-<div id="advanced_search_template_general" class="adv_searchpopup_bg" style="display: none;">
+<div id="advanced_search_popup_general" class="adv_searchpopup_bg" style="display: none;">
         <div class="adv_searchformbox">
             <form action="#" method="post">
             <ol>
@@ -1527,7 +1527,7 @@
         </div>
 </div>
 
-<div id="advanced_search_template_nostate" class="adv_searchpopup_bg" style="display: none;">
+<div id="advanced_search_popup_nostate" class="adv_searchpopup_bg" style="display: none;">
 
         <div class="adv_searchformbox">
             <form action="#" method="post">
@@ -1555,7 +1555,7 @@
 
 </div>
 
-<div id="advanced_search_template_nodomainaccount" class="adv_searchpopup_bg" style="display: none;">
+<div id="advanced_search_popup_nodomainaccount" class="adv_searchpopup_bg" style="display: none;">
         <div class="adv_searchformbox">
             <form action="#" method="post">
             <ol>
diff --git a/ui/jsp/ipaddress.jsp b/ui/jsp/ipaddress.jsp
index 82c164ee05f..2106d7cc03a 100644
--- a/ui/jsp/ipaddress.jsp
+++ b/ui/jsp/ipaddress.jsp
@@ -710,7 +710,7 @@
 
 
 <!-- advanced search template (begin) -->
-<div class="adv_searchpopup_bg" id="advanced_search_template" style="display:none;">
+<div class="adv_searchpopup_bg" id="advanced_search_popup" style="display:none;">
             <div class="adv_searchformbox">
                 <form action="#" method="post">
                 <ol>
diff --git a/ui/jsp/iso.jsp b/ui/jsp/iso.jsp
index 6a7f117410e..9ad2858d122 100644
--- a/ui/jsp/iso.jsp
+++ b/ui/jsp/iso.jsp
@@ -393,7 +393,7 @@
 </div>
 
 <!-- advanced search template (begin) -->
-<div class="adv_searchpopup_bg" id="advanced_search_template" style="display:none;">
+<div class="adv_searchpopup_bg" id="advanced_search_popup" style="display:none;">
             <div class="adv_searchformbox">
                 <form action="#" method="post">
                     <ol>
diff --git a/ui/jsp/network.jsp b/ui/jsp/network.jsp
index 77d10e2cebb..68a14ad7bb1 100644
--- a/ui/jsp/network.jsp
+++ b/ui/jsp/network.jsp
@@ -1010,7 +1010,7 @@
 <!-- Add network dialog for zone (end) -->
 
 <!-- advanced search template (begin) -->
-<div class="adv_searchpopup_bg" id="advanced_search_template" style="display:none;">
+<div class="adv_searchpopup_bg" id="advanced_search_popup" style="display:none;">
             <div class="adv_searchformbox">
                 <form action="#" method="post">
                     <ol>            
diff --git a/ui/jsp/networkoffering.jsp b/ui/jsp/networkoffering.jsp
index 5272167b249..a4d409a2d96 100644
--- a/ui/jsp/networkoffering.jsp
+++ b/ui/jsp/networkoffering.jsp
@@ -163,7 +163,7 @@
 
 
 <!-- advanced search template (begin) -->
-<div id="advanced_search_template" class="adv_searchpopup_bg" style="display: none;">
+<div id="advanced_search_popup" class="adv_searchpopup_bg" style="display: none;">
         <div class="adv_searchformbox">
             <form action="#" method="post">
             <ol>
diff --git a/ui/jsp/router.jsp b/ui/jsp/router.jsp
index e86ba51515a..2bdfdd87156 100644
--- a/ui/jsp/router.jsp
+++ b/ui/jsp/router.jsp
@@ -180,7 +180,7 @@
 
 
 <!-- advanced search template (begin) -->
-<div id="advanced_search_template" class="adv_searchpopup_bg" style="display: none;">
+<div id="advanced_search_popup" class="adv_searchpopup_bg" style="display: none;">
         <div class="adv_searchformbox">
             <form action="#" method="post">
             <ol>
diff --git a/ui/jsp/securitygroup.jsp b/ui/jsp/securitygroup.jsp
index 0f828fbc76a..51b0caa31fc 100644
--- a/ui/jsp/securitygroup.jsp
+++ b/ui/jsp/securitygroup.jsp
@@ -295,7 +295,7 @@
 <!-- Add Security Group Dialog (end) -->
 
 <!-- advanced search template (begin) -->
-<div class="adv_searchpopup_bg" id="advanced_search_template" style="display:none;">
+<div class="adv_searchpopup_bg" id="advanced_search_popup" style="display:none;">
             <div class="adv_searchformbox">
                 <form action="#" method="post">
                 <ol>
diff --git a/ui/jsp/serviceoffering.jsp b/ui/jsp/serviceoffering.jsp
index 91963a73606..9a06f0b77ec 100644
--- a/ui/jsp/serviceoffering.jsp
+++ b/ui/jsp/serviceoffering.jsp
@@ -264,7 +264,7 @@
 
 
 <!-- advanced search template (begin) -->
-<div class="adv_searchpopup_bg" id="advanced_search_template" style="display:none;">
+<div class="adv_searchpopup_bg" id="advanced_search_popup" style="display:none;">
             <div class="adv_searchformbox">
                 <form action="#" method="post">
                 <ol>
diff --git a/ui/jsp/snapshot.jsp b/ui/jsp/snapshot.jsp
index 30dedebded9..e4ff7400c62 100644
--- a/ui/jsp/snapshot.jsp
+++ b/ui/jsp/snapshot.jsp
@@ -193,7 +193,7 @@
 <!-- Create template from snapshot (end) -->
 
 <!-- advanced search template (begin) -->
-<div id="advanced_search_template" class="adv_searchpopup_bg" style="display: none;">
+<div id="advanced_search_popup" class="adv_searchpopup_bg" style="display: none;">
 
         <div class="adv_searchformbox">
             <form action="#" method="post">
diff --git a/ui/jsp/systemvm.jsp b/ui/jsp/systemvm.jsp
index b0acc2c0cab..e2c59985ef7 100644
--- a/ui/jsp/systemvm.jsp
+++ b/ui/jsp/systemvm.jsp
@@ -206,7 +206,7 @@
 
 
 <!-- advanced search template (begin) -->
-<div id="advanced_search_template" class="adv_searchpopup_bg" style="display: none;">
+<div id="advanced_search_popup" class="adv_searchpopup_bg" style="display: none;">
         <div class="adv_searchformbox">
             <form action="#" method="post">
             <ol>
diff --git a/ui/jsp/template.jsp b/ui/jsp/template.jsp
index 7bad44e272e..b8d90688399 100644
--- a/ui/jsp/template.jsp
+++ b/ui/jsp/template.jsp
@@ -410,7 +410,7 @@
 
 
 <!-- advanced search template (begin) -->
-<div class="adv_searchpopup_bg" id="advanced_search_template" style="display:none;">
+<div class="adv_searchpopup_bg" id="advanced_search_popup" style="display:none;">
             <div class="adv_searchformbox">
                 <form action="#" method="post">
                 <ol>
diff --git a/ui/jsp/volume.jsp b/ui/jsp/volume.jsp
index 98417c304f9..21b43515671 100644
--- a/ui/jsp/volume.jsp
+++ b/ui/jsp/volume.jsp
@@ -753,7 +753,7 @@
 <!-- Create template from snapshot (end) -->
 
 <!-- advanced search template (begin) -->
-<div class="adv_searchpopup_bg" id="advanced_search_template" style="display:none;">
+<div class="adv_searchpopup_bg" id="advanced_search_popup" style="display:none;">
             <div class="adv_searchformbox">
                 <form action="#" method="post">
                 <ol>