diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java
index ca343e6feb220411e7295c0a86c3ae092edeae7b..df430166e4cdaf34d0c0f662fe8bf90052538369 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java
@@ -379,6 +379,10 @@ public abstract class Dict
     //
     public static final String DATA_SET_SEARCH = "data_set_search";
 
+    public static final String MATCH_ALL = "match_all";
+
+    public static final String MATCH_ANY = "match_any";
+
     //
     // Unclassified
     //
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 3f267c6295ffb53df4d6a0da0c4d6ffccb5f26ee..0574ed092f2984812003d5f8b64574b411c0c84d 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
@@ -19,12 +19,10 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.extjs.gxt.ui.client.Style.HorizontalAlignment;
-import com.extjs.gxt.ui.client.Style.VerticalAlignment;
 import com.extjs.gxt.ui.client.widget.VerticalPanel;
-import com.extjs.gxt.ui.client.widget.layout.TableData;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetSearchCriterion;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SearchCriteria;
@@ -44,10 +42,9 @@ public class CriteriaWidget extends VerticalPanel
     {
         setLayoutOnChange(true);
         criteriaWidgets = new ArrayList<CriterionWidget>();
-        final TableData radioData =
-                new TableData(HorizontalAlignment.CENTER, VerticalAlignment.MIDDLE);
-        radioData.setPadding(5);
-        add(matchRadios = new MatchCriteriaRadio(), radioData);
+        add(matchRadios =
+                new MatchCriteriaRadio(viewContext.getMessage(Dict.MATCH_ALL), viewContext
+                        .getMessage(Dict.MATCH_ANY)));
         addCriterion(new CriterionWidget(viewContext, this, "first"));
     }
 
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 1bcebf518a268e96f99788d507bcfdc0dd3bb699..1475580896b178caa00bb68d15fc5df8c83c9043 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
@@ -71,6 +71,9 @@ public class CriterionWidget extends HorizontalPanel
         add(removeButton = createRemoveButton(), tableData);
     }
 
+    /**
+     * Allows to enable/disable "remove" button.
+     */
     public void enableRemoveButton(boolean enable)
     {
         removeButton.setEnabled(enable);
@@ -121,12 +124,19 @@ public class CriterionWidget extends HorizontalPanel
         parent.removeCriterion(this);
     }
 
+    /**
+     * Resets the state of criterion <em>name</em> and <em>value</em>.
+     */
     public void reset()
     {
         valueField.reset();
         nameField.reset();
     }
 
+    /**
+     * Returns {@link DataSetSearchCriterion} for selected <em>name</em> and <em>value</em>. If
+     * either <em>name</em> or <em>value</em> is not specified, returns null.
+     */
     public DataSetSearchCriterion tryGetValue()
     {
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetSearchFieldsSelectionWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetSearchFieldsSelectionWidget.java
index c953d41fb45c7e7dd9c374bec11fccf3b5cb69f3..6d69b9858dda853c8649aa861bee11fcde972165 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetSearchFieldsSelectionWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetSearchFieldsSelectionWidget.java
@@ -77,6 +77,10 @@ public final class DataSetSearchFieldsSelectionWidget extends
         return null;
     }
 
+    /**
+     * Returns {@link DataSetSearchField} connected with selected option, or null - if nothing
+     * selected.
+     */
     public DataSetSearchField tryGetSelectedField()
     {
         return (DataSetSearchField) GWTUtils.tryGetSingleSelected(this);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetSearchHitColDefKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetSearchHitColDefKind.java
index c7cefe1be056dd997716403d0bfc2fdd3491b183..e6dd0c1290834e05da353f68b01b234690704495 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetSearchHitColDefKind.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetSearchHitColDefKind.java
@@ -30,7 +30,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMess
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.DataSetSearchHit;
 
 /**
- * FIXME
+ * Definition of data set search results table columns.
  * 
  * @author Izabela Adamczyk
  */
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetSearchHitGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetSearchHitGrid.java
index 76dd564d1ba496414810fdf11970f429a4740a3e..2009e073ce427517ab2191386cb491170d9a239a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetSearchHitGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetSearchHitGrid.java
@@ -97,7 +97,7 @@ public class DataSetSearchHitGrid extends
         }
     }
 
-    protected IColumnDefinitionKind<DataSetSearchHit>[] getStaticColumnsDefinition()
+    private IColumnDefinitionKind<DataSetSearchHit>[] getStaticColumnsDefinition()
     {
         return DataSetSearchHitColDefKind.values();
     }
@@ -129,7 +129,7 @@ public class DataSetSearchHitGrid extends
         viewContext.getService().prepareExportDataSetSearchHits(exportCriteria, callback);
     }
 
-    protected void refresh(SearchCriteria newCriteria)
+    private void refresh(SearchCriteria newCriteria)
     {
         criteria = newCriteria;
         refresh();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/MatchCriteriaRadio.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/MatchCriteriaRadio.java
index 9369bc2a80124d3ab67b83355aedcd7db7074bb1..edc0ece0bfe043db8c07a3e1349a83b3e03688d2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/MatchCriteriaRadio.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/MatchCriteriaRadio.java
@@ -16,13 +16,19 @@
 
 package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data;
 
+import com.extjs.gxt.ui.client.Style.HorizontalAlignment;
+import com.extjs.gxt.ui.client.Style.VerticalAlignment;
 import com.extjs.gxt.ui.client.widget.HorizontalPanel;
 import com.extjs.gxt.ui.client.widget.form.Radio;
 import com.extjs.gxt.ui.client.widget.form.RadioGroup;
+import com.extjs.gxt.ui.client.widget.layout.TableData;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SearchCriteria;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SearchCriteria.CriteriaConnection;
 
 /**
+ * Widget which enables to select {@link CriteriaConnection} type.
+ * 
  * @author Izabela Adamczyk
  */
 public class MatchCriteriaRadio extends HorizontalPanel
@@ -32,20 +38,23 @@ public class MatchCriteriaRadio extends HorizontalPanel
 
     private final Radio andRadio;
 
-    public MatchCriteriaRadio()
+    public MatchCriteriaRadio(String matchAll, String matchAny)
     {
         RadioGroup group = new RadioGroup();
         andRadio = new Radio();
-        andRadio.setBoxLabel("match all"); // FIXME
+        andRadio.setBoxLabel(matchAll);
 
         orRadio = new Radio();
-        orRadio.setBoxLabel("match any");
+        orRadio.setBoxLabel(matchAny);
 
         group.add(andRadio);
         group.add(orRadio);
 
         reset();
-        add(group);
+        final TableData radioData =
+                new TableData(HorizontalAlignment.CENTER, VerticalAlignment.MIDDLE);
+        radioData.setPadding(5);
+        add(group, radioData);
     }
 
     public void reset()
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DataSetSearchHit.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DataSetSearchHit.java
index d033977c4aa2df40d046ff0d8070f61bc9c4ef54..29123fd79283da256d31386c5c4efe8317ccead8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DataSetSearchHit.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DataSetSearchHit.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.dto;
 import com.google.gwt.user.client.rpc.IsSerializable;
 
 /**
- * FIXME
+ * Single result of data set search.
  * 
  * @author Izabela Adamczyk
  */
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchCriteria.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchCriteria.java
index 1f71bb4ab924d215d5ae7e4c3d79015107cf46ed..8e9d9c88b6c8df31a4d7e872b797688660cd0c61 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchCriteria.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchCriteria.java
@@ -21,7 +21,7 @@ import java.util.List;
 import com.google.gwt.user.client.rpc.IsSerializable;
 
 /**
- * FIXME
+ * Describes search criteria specific to data set search.
  * 
  * @author Izabela Adamczyk
  */
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetSearchHitDTO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetSearchHitDTO.java
index 3ef40812fe0a1a47302e76414e4e374f451b166f..fa5e37fc470ae5b7a343b257bbcc538edc7530bb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetSearchHitDTO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetSearchHitDTO.java
@@ -17,7 +17,7 @@
 package ch.systemsx.cisd.openbis.generic.shared.dto;
 
 /**
- * FIXME
+ * Single result of data set search.
  * 
  * @author Izabela Adamczyk
  */
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js
index db55b8671debf8f0007dba2da9a23c6f3aaf283f..3ba1bd43e6233f12cd8dd485abf0bb21a472079b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js
@@ -206,6 +206,8 @@ var common = {
  //
  data_set_search: "Data Set Search",
  location: "Location",
+ match_all: "Match all criteria",
+ match_any: "Match any criteria",
  
   // LAST LINE: KEEP IT AT THE END
   lastline: "" // we need a line without a comma