--- tasklist.ui/src/org/netbeans/modules/tasklist/filter/KeywordsPanel.form	
+++ tasklist.ui/src/org/netbeans/modules/tasklist/filter/KeywordsPanel.form	
@@ -67,8 +67,8 @@ 
         <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
           <ComponentRef name="matchGroup"/>
         </Property>
-        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor" preCode="/*" postCode="*/">
-          <ResourceString bundle="org/netbeans/modules/tasklist/filter/Bundle.properties" key="MatchAll" replaceFormat="NbBundle.getMessage(FilterPanel.class, &quot;{key}&quot;)); // NOI18N("/>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/tasklist/filter/Bundle.properties" key="MatchAll" replaceFormat="NbBundle.getMessage(KeywordsPanel.class, &quot;{key}&quot;)); // NOI18N("/>
         </Property>
         <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/netbeans/modules/tasklist/filter/Bundle.properties" key="HINT_MatchAll" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -82,8 +82,8 @@ 
           <ComponentRef name="matchGroup"/>
         </Property>
         <Property name="selected" type="boolean" value="true"/>
-        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor" preCode="/*" postCode="*/">
-          <ResourceString bundle="org/netbeans/modules/tasklist/filter/Bundle.properties" key="MatchAny" replaceFormat="NbBundle.getMessage(FilterPanel.class, &quot;{key}&quot;)); // NOI18N("/>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/tasklist/filter/Bundle.properties" key="MatchAny" replaceFormat="NbBundle.getMessage(KeywordsPanel.class, &quot;{key}&quot;)); // NOI18N("/>
         </Property>
         <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/netbeans/modules/tasklist/filter/Bundle.properties" key="HINT_MatchAny" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -119,8 +119,8 @@ 
     </Container>
     <Component class="javax.swing.JButton" name="fewerButton">
       <Properties>
-        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor" preCode="/*" postCode="*/">
-          <ResourceString bundle="org/netbeans/modules/tasklist/filter/Bundle.properties" key="Fewer" replaceFormat="NbBundle.getMessage(FilterPanel.class, &quot;{key}&quot;)); // NOI18N("/>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/tasklist/filter/Bundle.properties" key="Fewer" replaceFormat="NbBundle.getMessage(KeywordsPanel.class, &quot;{key}&quot;)); // NOI18N("/>
         </Property>
         <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/netbeans/modules/tasklist/filter/Bundle.properties" key="HINT_Fewer" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -129,8 +129,8 @@ 
     </Component>
     <Component class="javax.swing.JButton" name="moreButton">
       <Properties>
-        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor" preCode="/*" postCode="*/">
-          <ResourceString bundle="org/netbeans/modules/tasklist/filter/Bundle.properties" key="More" replaceFormat="NbBundle.getMessage(FilterPanel.class, &quot;{key}&quot;)); // NOI18N("/>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/tasklist/filter/Bundle.properties" key="More" replaceFormat="NbBundle.getMessage(KeywordsPanel.class, &quot;{key}&quot;)); // NOI18N("/>
         </Property>
         <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/netbeans/modules/tasklist/filter/Bundle.properties" key="HINT_More" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
--- tasklist.ui/src/org/netbeans/modules/tasklist/filter/KeywordsPanel.java	
+++ tasklist.ui/src/org/netbeans/modules/tasklist/filter/KeywordsPanel.java	
@@ -78,7 +78,7 @@ 
     private FilterSubpanel subpanel;
 
     /**
-     * Creates new form FilterPanel. 
+     * Creates new form KeywordsPanel. 
      *
      * @param view view with the given filter
      * @param filter filter to be edited. Can be null and in that case
@@ -168,17 +168,13 @@ 
     private void initComponents() {
 
         matchGroup.add(matchAllRadio);
-        /*
-        org.openide.awt.Mnemonics.setLocalizedText(matchAllRadio, NbBundle.getMessage(FilterPanel.class, "MatchAll")); // NOI18N(); // NOI18N
-        */
+        org.openide.awt.Mnemonics.setLocalizedText(matchAllRadio, NbBundle.getMessage(KeywordsPanel.class, "MatchAll")); // NOI18N(); // NOI18N
         matchAllRadio.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordsPanel.class, "HINT_MatchAll")); // NOI18N
         matchAllRadio.setOpaque(false);
 
         matchGroup.add(matchAnyRadio);
         matchAnyRadio.setSelected(true);
-        /*
-        org.openide.awt.Mnemonics.setLocalizedText(matchAnyRadio, NbBundle.getMessage(FilterPanel.class, "MatchAny")); // NOI18N(); // NOI18N
-        */
+        org.openide.awt.Mnemonics.setLocalizedText(matchAnyRadio, NbBundle.getMessage(KeywordsPanel.class, "MatchAny")); // NOI18N(); // NOI18N
         matchAnyRadio.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordsPanel.class, "HINT_MatchAny")); // NOI18N
         matchAnyRadio.setOpaque(false);
 
@@ -190,14 +186,10 @@ 
         conditionsPanel.setLayout(new java.awt.GridBagLayout());
         conditionsScrollPane.setViewportView(conditionsPanel);
 
-        /*
-        org.openide.awt.Mnemonics.setLocalizedText(fewerButton, NbBundle.getMessage(FilterPanel.class, "Fewer")); // NOI18N(); // NOI18N
-        */
+        org.openide.awt.Mnemonics.setLocalizedText(fewerButton, NbBundle.getMessage(KeywordsPanel.class, "Fewer")); // NOI18N(); // NOI18N
         fewerButton.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordsPanel.class, "HINT_Fewer")); // NOI18N
 
-        /*
-        org.openide.awt.Mnemonics.setLocalizedText(moreButton, NbBundle.getMessage(FilterPanel.class, "More")); // NOI18N(); // NOI18N
-        */
+        org.openide.awt.Mnemonics.setLocalizedText(moreButton, NbBundle.getMessage(KeywordsPanel.class, "More")); // NOI18N(); // NOI18N
         moreButton.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordsPanel.class, "HINT_More")); // NOI18N
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);