--- tasklist.ui/src/org/netbeans/modules/tasklist/filter/KeywordsPanel.form	
+++ tasklist.ui/src/org/netbeans/modules/tasklist/filter/KeywordsPanel.form	
@@ -1,4 +1,4 @@ 
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.1" encoding="UTF-8" ?>
 
 <Form version="1.3" maxVersion="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <NonVisualComponents>
@@ -30,12 +30,11 @@ 
                       <Component id="fewerButton" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <Group type="102" alignment="0" attributes="0">
-                      <Component id="matchAllRadio" pref="149" max="32767" attributes="0"/>
+                      <Component id="matchAllRadio" min="-2" max="-2" attributes="0"/>
                       <EmptySpace min="-2" max="-2" attributes="0"/>
-                      <Component id="matchAnyRadio" pref="157" max="32767" attributes="0"/>
-                      <EmptySpace min="-2" pref="278" max="-2" attributes="0"/>
+                      <Component id="matchAnyRadio" min="-2" max="-2" attributes="0"/>
                   </Group>
-                  <Component id="conditionsScrollPane" alignment="1" pref="584" max="32767" attributes="0"/>
+                  <Component id="conditionsScrollPane" alignment="1" pref="596" max="32767" attributes="0"/>
               </Group>
               <EmptySpace min="-2" max="-2" attributes="0"/>
           </Group>
@@ -49,7 +48,7 @@ 
                   <Component id="matchAllRadio" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="matchAnyRadio" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace max="-2" attributes="0"/>
+              <EmptySpace min="-2" max="-2" attributes="0"/>
               <Component id="conditionsScrollPane" pref="321" max="32767" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="1" attributes="0">
--- tasklist.ui/src/org/netbeans/modules/tasklist/filter/KeywordsPanel.java	
+++ tasklist.ui/src/org/netbeans/modules/tasklist/filter/KeywordsPanel.java	
@@ -1,7 +1,7 @@ 
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 1997-2010 Sun Microsystems, Inc. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common
@@ -204,11 +204,11 @@ 
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(fewerButton))
                     .addGroup(layout.createSequentialGroup()
-                        .addComponent(matchAllRadio, javax.swing.GroupLayout.PREFERRED_SIZE, 149, Short.MAX_VALUE)
+                  .addComponent(matchAllRadio)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(matchAnyRadio, javax.swing.GroupLayout.PREFERRED_SIZE, 157, Short.MAX_VALUE)
-                        .addGap(278, 278, 278))
-                    .addComponent(conditionsScrollPane, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 584, Short.MAX_VALUE))
+                  .addComponent(matchAnyRadio)
+                  .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED))
+               .addComponent(conditionsScrollPane, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 596, Short.MAX_VALUE))
                 .addContainerGap())
         );
         layout.setVerticalGroup(