diff --git a/xdoc/src/plugin-resources/css/maven-base.css b/xdoc/src/plugin-resources/css/maven-base.css
index e58d3785..c97b6175 100644
--- a/xdoc/src/plugin-resources/css/maven-base.css
+++ b/xdoc/src/plugin-resources/css/maven-base.css
@@ -103,15 +103,15 @@ div.clear hr{
   width: 90px;
   height: 30px;
 }
-#search img {
+#searchbar img {
     margin: 0px;
     display: block;
 }
-#search #q, #search #btnG {
+#searchbar #q, #searchbar #btnG {
     border: 1px solid #999;
     margin-bottom:10px;
 }
-#search form {
+#searchbar form {
     margin: 0px;
 }
 #lastPublished {
diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl
index 3ded4b7a..39a125f4 100644
--- a/xdoc/src/plugin-resources/site.jsl
+++ b/xdoc/src/plugin-resources/site.jsl
@@ -376,7 +376,7 @@
     </j:choose>
   </jsl:template>
 
-  <jsl:template match="menu/item" trim="true">
+  <jsl:template match="item" trim="true">
     <x:set var="item" select="."/>
     <x:set var="_name" select="string(@name)"/>
     <x:set var="_link" select="string(@href)"/>
@@ -409,7 +409,7 @@
     <!-- Search code: http://www.google.com/searchcode.html -->
     <!-- Google logos: http://www.google.com/stickers.html -->
     <!-- Terms: http://www.google.com./services/terms_free.html -->
-    <div id="search">
+    <div id="searchbar">
       <h5>Search ${pom.name}</h5>
       <form method="get" action="http://www.google.com/search">
         <a class="navlink" href="http://www.google.com">