3 files changed, 13 insertions, 5 deletions
diff --git a/template/en/default/search/search-advanced.html.tmpl b/template/en/default/search/search-advanced.html.tmpl
index e746df09b..c9cac7643 100644
--- a/template/en/default/search/search-advanced.html.tmpl
+++ b/template/en/default/search/search-advanced.html.tmpl
@@ -37,7 +37,7 @@ var queryform = "queryform"
 
 [% PROCESS global/header.html.tmpl
   title = "Search for $terms.bugs"
-  h1 = ""
+  header = ""
   onload = "doOnSelectProduct(0); initHelp();"
   javascript = js_data
   javascript_urls = [ "js/productform.js" ]
@@ -46,7 +46,7 @@ var queryform = "queryform"
            }"
 %]
 
-[% PROCESS search/tabs.html.tmpl %]
+[% WRAPPER search/tabs.html.tmpl %]
 
 [% button_name = "Search" %]
 
@@ -84,4 +84,6 @@ var queryform = "queryform"
 
 [% PROCESS "search/search-help.html.tmpl" IF cgi.param("help") %]
 
+[% END %]
+
 [% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/search/search-specific.html.tmpl b/template/en/default/search/search-specific.html.tmpl
index 8288b76e3..e09caca7f 100644
--- a/template/en/default/search/search-specific.html.tmpl
+++ b/template/en/default/search/search-specific.html.tmpl
@@ -23,10 +23,10 @@
 
 [% PROCESS global/header.html.tmpl 
   title = "Find a Specific " _ terms.Bug
-  h1 = ""
+  header = ''
 %]
 
-[% PROCESS search/tabs.html.tmpl %]
+[% WRAPPER search/tabs.html.tmpl %]
 
 <p>
 Find a specific [% terms.bug %] by entering words that describe it.  
@@ -116,5 +116,7 @@ for "crash secure SSL flash".
 </table>
 </form>
 
+[% END %]
+
 [% PROCESS global/footer.html.tmpl %]
 
diff --git a/template/en/default/search/tabs.html.tmpl b/template/en/default/search/tabs.html.tmpl
index 00358cb59..2fe05fa84 100644
--- a/template/en/default/search/tabs.html.tmpl
+++ b/template/en/default/search/tabs.html.tmpl
@@ -24,10 +24,14 @@
   # This template has no interface.
   #%]
 
-[% PROCESS global/tabs.html.tmpl
+[% WRAPPER global/tabs.html.tmpl
      tabs = [ { name => 'specific', label => "Find a Specific $terms.Bug",
                 link => "query.cgi?format=specific" },
               { name => 'advanced', label => "Advanced Search",
                 link => "query.cgi?format=advanced" } ]
      current_tab_name = query_format || format || "advanced"
 %]
+
+[% content %]
+
+[% END %]