diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/dependency-tree.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/dependency-tree.html.tmpl
index ba0b8213f9a..fb6163b2414 100644
--- a/mozilla/webtools/bugzilla/template/en/default/bug/dependency-tree.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/bug/dependency-tree.html.tmpl
@@ -1,3 +1,4 @@
+<!-- 1.0@bugzilla.org -->
 [%# The contents of this file are subject to the Mozilla Public
   # License Version 1.1 (the "License"); you may not use this file
   # except in compliance with the License. You may obtain a copy of
@@ -52,9 +53,9 @@
 [%# Display the tree of bugs that this bug blocks. %]
 <h3>Bugs that bug <a href="show_bug.cgi?id=[% bugid %]">[% bugid %]</a> blocks
 [% IF blocked_ids.size > 0 %]
-  (<a href="buglist.cgi?branch_id=[% blocked_ids.join(",") %]">view as bug list</a>
+  (<a href="buglist.cgi?bug_id=[% blocked_ids.join(",") %]">view as bug list</a>
   [% IF canedit && blocked_ids.size > 1 %]
-    | <a href="buglist.cgi?branch_id=[% blocked_ids.join(",") %]&amp;tweak=1">change several</a>
+    | <a href="buglist.cgi?bug_id=[% blocked_ids.join(",") %]&amp;tweak=1">change several</a>
   [% END %])
   [% IF maxdepth || hide_resolved %]
     <small><b>
@@ -86,7 +87,7 @@
     <li>
       [% "<strike>" IF !dep.open %]
       <a href="show_bug.cgi?id=[% dep_id %]">[% dep_id %] 
-        [[% dep.milestone FILTER html %], 
+        [[% IF dep.milestone %][% dep.milestone FILTER html %], [% END %]
         [% dep.assignee_email FILTER html %]] - 
         [% IF dep.seen %]
           <i>&lt;This bug appears elsewhere in this tree&gt;</i></a>
@@ -116,7 +117,7 @@
            style="display: inline; margin: 0px;">
      <input name="id" type="hidden" value="[% bugid %]">
      [% IF maxdepth %]
-       <input name="maxdepth" type="hidden" value="$maxdepth">
+       <input name="maxdepth" type="hidden" value="[% maxdepth %]">
      [% END %]
      <input type="hidden" name="hide_resolved" value="[% hide_resolved ? 0 : 1 %]">
      <input type="submit" value="[% hide_resolved ? "Show" : "Hide" %] Resolved">
diff --git a/mozilla/webtools/bugzilla/template/en/default/global/header.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/global/header.html.tmpl
index 4dc89e0534d..dfb3cc0801b 100644
--- a/mozilla/webtools/bugzilla/template/en/default/global/header.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/global/header.html.tmpl
@@ -16,13 +16,7 @@
     [% Param('headerhtml') %]
     
     [% jscript %]
-
-    <script type="application/x-javascript">
-    <!--
-      [%+ INCLUDE "help/show-hide.js.tmpl" %]
-    // -->
-    </script>
-        
+    
     [% IF style %]
       <style type="text/css">
         [% style %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/search/search-advanced.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/search/search-advanced.html.tmpl
index 85e66356bc0..3079ea00689 100644
--- a/mozilla/webtools/bugzilla/template/en/default/search/search-advanced.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/search/search-advanced.html.tmpl
@@ -331,17 +331,6 @@ function selectProduct(f) {
   { value => "anywords", description => "contains any of the words" },
   { value => "regexp", description => "matches the regexp" },
   { value => "notregexp", description => "doesn&#8217;t match the regexp" } ] %]
-
-[%# The decent help requires Javascript %]
-<script> <!--
-   document.write("<p><a href='query.cgi?help=1'>Give me help</a> with this form (reloads page.)</p>");
-// -->
-</script>
-<noscript>
-  <p>
-    <a href="queryhelp.cgi">Give me help</a> with this form.
-  </p>
-</noscript>
      
 <form method="get" action="buglist.cgi" name="queryform">
 
diff --git a/mozilla/webtools/bugzilla/template/en/default/search/search.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/search/search.html.tmpl
index 85e66356bc0..3079ea00689 100644
--- a/mozilla/webtools/bugzilla/template/en/default/search/search.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/search/search.html.tmpl
@@ -331,17 +331,6 @@ function selectProduct(f) {
   { value => "anywords", description => "contains any of the words" },
   { value => "regexp", description => "matches the regexp" },
   { value => "notregexp", description => "doesn&#8217;t match the regexp" } ] %]
-
-[%# The decent help requires Javascript %]
-<script> <!--
-   document.write("<p><a href='query.cgi?help=1'>Give me help</a> with this form (reloads page.)</p>");
-// -->
-</script>
-<noscript>
-  <p>
-    <a href="queryhelp.cgi">Give me help</a> with this form.
-  </p>
-</noscript>
      
 <form method="get" action="buglist.cgi" name="queryform">