diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/ItemSearch.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/ItemSearch.java
index a6b55a3e6..05b157226 100755
--- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/ItemSearch.java
+++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/ItemSearch.java
@@ -62,7 +62,7 @@ public class ItemSearch extends Form implements Resettable {
         super("itemSearch", new SimpleContainer());
         //setMethod("GET");
         itemSearchSection = createSearchSection(context, limitToContentSection);
-        add(itemSearchSection);
+        super.add(itemSearchSection);
     }
 
     protected ItemSearchSection createSearchSection(final String context,
diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/search/ItemQueryComponent.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/search/ItemQueryComponent.java
index 3252f95b1..48690f320 100755
--- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/search/ItemQueryComponent.java
+++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/search/ItemQueryComponent.java
@@ -47,7 +47,7 @@ public class ItemQueryComponent extends BaseQueryComponent {
                               final boolean limitToContentSection,
                               final ContentType type) {
         this.context = context;
-
+        
 //ToDo      
 //            add(new PermissionFilterComponent(
 //                    SecurityManager.CMS_PREVIEW_ITEM));
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsResources.properties b/ccm-cms/src/main/resources/org/librecms/CmsResources.properties
index 429d41978..22b16eea3 100644
--- a/ccm-cms/src/main/resources/org/librecms/CmsResources.properties
+++ b/ccm-cms/src/main/resources/org/librecms/CmsResources.properties
@@ -519,3 +519,4 @@ cms.ui.item.lifecycle.republish=Republish
 cms.ui.item.lifecycle.unpublish=Unpublish
 cms.ui.item.lifecycle.do=Do
 cms.ui.item.lifecycle.republish_and_reset=Republish and reset lifecycle
+cms.ui.search.help=Enter some search terms
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties b/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties
index f2c2173cb..ae0ce3345 100644
--- a/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties
+++ b/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties
@@ -516,3 +516,4 @@ cms.ui.item.lifecycle.republish=Erneut publizieren
 cms.ui.item.lifecycle.unpublish=Depublizieren
 cms.ui.item.lifecycle.do=Ausf\u00fchren
 cms.ui.item.lifecycle.republish_and_reset=Erneut publizieren und Lebenszyklus zur\u00fccksetzen
+cms.ui.search.help=Enter some search terms
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties b/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties
index 29fa1f682..c532ef513 100644
--- a/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties
+++ b/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties
@@ -478,3 +478,4 @@ cms.ui.item.lifecycle.republish=Republish
 cms.ui.item.lifecycle.unpublish=Unpublish
 cms.ui.item.lifecycle.do=Do
 cms.ui.item.lifecycle.republish_and_reset=Republish and reset lifecycle
+cms.ui.search.help=Enter some search terms
diff --git a/ccm-core/src/main/java/com/arsdigita/search/ui/BaseQueryComponent.java b/ccm-core/src/main/java/com/arsdigita/search/ui/BaseQueryComponent.java
index 4538578d6..87909dd38 100755
--- a/ccm-core/src/main/java/com/arsdigita/search/ui/BaseQueryComponent.java
+++ b/ccm-core/src/main/java/com/arsdigita/search/ui/BaseQueryComponent.java
@@ -60,12 +60,13 @@ public class BaseQueryComponent extends QueryComponent {
 
     private Set filters;
     private Form form;
-    private StringParameter termsParameter = new StringParameter("terms");
+    private final StringParameter termsParameter = new StringParameter("terms");
 
     /**
      * Creates a new query component
      */
     public BaseQueryComponent() {
+        
         super("query");
         filters = new HashSet();
     }
@@ -91,16 +92,18 @@ public class BaseQueryComponent extends QueryComponent {
      */
     @Override
     protected String getTerms(final PageState state) {
+
         final FormData formData = form.getFormData(state);
 
-        if (formData != null) {
+        
+        if (formData == null) {
+            return null;
+        } else {
             final ParameterData data = formData.getParameter(termsParameter.
-                    getName());
-            LOGGER.debug("Search terms were: {}", (String) data.getValue());
+                getName());
+            LOGGER.debug("Search terms were: {}", data.getValue());
 
             return (String) data.getValue();
-        } else {
-            return null;
         }
     }
 
diff --git a/ccm-core/src/main/java/com/arsdigita/search/ui/QueryComponent.java b/ccm-core/src/main/java/com/arsdigita/search/ui/QueryComponent.java
index 18e2ad25a..567355f97 100755
--- a/ccm-core/src/main/java/com/arsdigita/search/ui/QueryComponent.java
+++ b/ccm-core/src/main/java/com/arsdigita/search/ui/QueryComponent.java
@@ -22,7 +22,6 @@ import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.SimpleContainer;
 import com.arsdigita.search.SearchConstants;
 
-import com.arsdigita.util.Assert;
 import org.apache.lucene.search.Query;
 import org.hibernate.search.query.dsl.QueryBuilder;
 import org.libreccm.cdi.utils.CdiUtil;
@@ -59,16 +58,21 @@ public abstract class QueryComponent extends SimpleContainer
      */
     @Override
     public Query getQuerySpecification(final PageState state) {
+        
         final String terms = getTerms(state);
 
         final CdiUtil cdiUtil = CdiUtil.createCdiUtil();
         final SearchManager searchManager = cdiUtil.
                 findBean(SearchManager.class);
         
-        final QueryBuilder queryBuilder = searchManager.createQueryBuilder(CcmObject.class);
+        final QueryBuilder queryBuilder = searchManager
+            .createQueryBuilder(CcmObject.class);
         
         return queryBuilder
-                .keyword().onFields("displayName", "summary", "description", "title")
+                .keyword().onFields("displayName", 
+                                    "summary", 
+                                    "description", 
+                                    "title")
                 .matching(terms)
                 .createQuery();
         
diff --git a/ccm-theme-foundry/src/main/resources/themes/foundry/foundry/lib/search/query.xsl b/ccm-theme-foundry/src/main/resources/themes/foundry/foundry/lib/search/query.xsl
index 818438a8a..8624eea25 100644
--- a/ccm-theme-foundry/src/main/resources/themes/foundry/foundry/lib/search/query.xsl
+++ b/ccm-theme-foundry/src/main/resources/themes/foundry/foundry/lib/search/query.xsl
@@ -36,7 +36,7 @@
                 xmlns:nav="http://ccm.redhat.com/navigation" 
                 xmlns:search="http://rhea.redhat.com/search/1.0"
                 exclude-result-prefixes="xsl bebop cms foundry nav search" 
-                version="1.0">
+                version="2.0">
   
     <!-- Show the search queries for the admin pages -->
     <xsl:template match="search:query">
diff --git a/ccm-theme-foundry/src/main/resources/themes/foundry/foundry/lib/template-tags/admin/common.xsl b/ccm-theme-foundry/src/main/resources/themes/foundry/foundry/lib/template-tags/admin/common.xsl
index d4743c0f5..0e4d2e28d 100644
--- a/ccm-theme-foundry/src/main/resources/themes/foundry/foundry/lib/template-tags/admin/common.xsl
+++ b/ccm-theme-foundry/src/main/resources/themes/foundry/foundry/lib/template-tags/admin/common.xsl
@@ -52,11 +52,11 @@
                     <xsl:call-template name="foundry:process-datatree-attributes"/>
                     <xsl:apply-templates select="$data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:body 
                                                  | $data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:right"/>
-                    <xsl:message>
+                    <!--<xsl:message>
                         <xsl:value-of select="concat('Applying template for bebop:pageState to ', 
                                                      count($data-tree//bebop:currentPane/bebop:form//bebop:pageState), 
                                                      ' objects...')"/>
-                    </xsl:message>
+                    </xsl:message>-->
                     <xsl:apply-templates select="$data-tree//bebop:currentPane/bebop:form//bebop:pageState"/>
                 </form>
             </xsl:when>
@@ -103,11 +103,11 @@
                     <!--<xsl:attribute name="method" select="'post'"/>-->
                     <xsl:call-template name="foundry:process-datatree-attributes"/>
                     <xsl:apply-templates select="$data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:left"/>
-                     <xsl:message>
+                     <!--<xsl:message>
                         <xsl:value-of select="concat('Applying template for bebop:pageState to ', 
                                                      count($data-tree//bebop:currentPane/bebop:form//bebop:pageState), 
                                                      ' objects...')"/>
-                    </xsl:message>
+                    </xsl:message>-->
                     <xsl:apply-templates select="$data-tree//bebop:currentPane/bebop:form//bebop:pageState"/>
                 </form>
             </xsl:when>