diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/CriteriaWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/CriteriaWidget.java
index dc27358cfdb87a19ffdc911939df8443389903b6..3f267c6295ffb53df4d6a0da0c4d6ffccb5f26ee 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/CriteriaWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/CriteriaWidget.java
@@ -38,7 +38,7 @@ public class CriteriaWidget extends VerticalPanel
 {
     private final List<CriterionWidget> criteriaWidgets;
 
-    private MatchCriteriaRadio matchRadios;
+    private final MatchCriteriaRadio matchRadios;
 
     public CriteriaWidget(IViewContext<ICommonClientServiceAsync> viewContext)
     {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/CriterionWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/CriterionWidget.java
index 92669f333171660525d7f7948ce97307a5869f04..1bcebf518a268e96f99788d507bcfdc0dd3bb699 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/CriterionWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/CriterionWidget.java
@@ -38,15 +38,15 @@ public class CriterionWidget extends HorizontalPanel
 
     private final CriteriaWidget parent;
 
-    private DataSetSearchFieldsSelectionWidget nameField;
+    private final DataSetSearchFieldsSelectionWidget nameField;
 
     private final String idSuffix;
 
-    private int generatedChildren;
+    private final TextField<String> valueField;
 
-    private TextField<String> valueField;
+    private final Button removeButton;
 
-    private Button removeButton;
+    private int generatedChildren;
 
     public CriterionWidget(IViewContext<ICommonClientServiceAsync> viewContext,
             CriteriaWidget parent, String idSuffix)
@@ -102,7 +102,7 @@ public class CriterionWidget extends HorizontalPanel
             };
     }
 
-    String getChildId()
+    private String getChildId()
     {
         return idSuffix + "_" + generatedChildren;
     }