diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/SearchCriteriaToDetailedSearchCriteriaTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/SearchCriteriaToDetailedSearchCriteriaTranslator.java
index 7a3c5e085767758928c4ca0fea781c6a32b2496c..00a8780ae850dabb1ed791f68dd7218ca95974d2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/SearchCriteriaToDetailedSearchCriteriaTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/SearchCriteriaToDetailedSearchCriteriaTranslator.java
@@ -321,10 +321,10 @@ public class SearchCriteriaToDetailedSearchCriteriaTranslator
                 case EQUALS:
                     t = CompareType.EQUALS;
                     break;
-                case LESS_THAN:
+                case LESS_THAN_OR_EQUAL:
                     t = CompareType.LESS_THAN_OR_EQUAL;
                     break;
-                case MORE_THAN:
+                case MORE_THAN_OR_EQUAL:
                     t = CompareType.MORE_THAN_OR_EQUAL;
                     break;
                 default:
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceJsonApiTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceJsonApiTest.java
index a087ca09b8a635acc8dfe022330130fcf75134b9..80505c2e61521a35b2f640651f129012f2e1c802 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceJsonApiTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceJsonApiTest.java
@@ -611,16 +611,16 @@ public class GeneralInformationServiceJsonApiTest extends RemoteApiTestCase
         {
 
             sc.addMatchClause(MatchClause.createAttributeMatch(
-                    MatchClauseAttribute.REGISTRATION_DATE, SearchCriteria.CompareMode.LESS_THAN,
-                    lessThan));
+                    MatchClauseAttribute.REGISTRATION_DATE,
+                    SearchCriteria.CompareMode.LESS_THAN_OR_EQUAL, lessThan));
         }
 
         if (moreThan != null)
         {
 
             sc.addMatchClause(MatchClause.createAttributeMatch(
-                    MatchClauseAttribute.REGISTRATION_DATE, SearchCriteria.CompareMode.MORE_THAN,
-                    moreThan));
+                    MatchClauseAttribute.REGISTRATION_DATE,
+                    SearchCriteria.CompareMode.MORE_THAN_OR_EQUAL, moreThan));
         }
 
         if (equal != null)
@@ -688,9 +688,9 @@ public class GeneralInformationServiceJsonApiTest extends RemoteApiTestCase
         SearchCriteria sc = new SearchCriteria();
 
         sc.addMatchClause(MatchClause.createAttributeMatch(MatchClauseAttribute.MODIFICATION_DATE,
-                SearchCriteria.CompareMode.MORE_THAN, lower));
+                SearchCriteria.CompareMode.MORE_THAN_OR_EQUAL, lower));
         sc.addMatchClause(MatchClause.createAttributeMatch(MatchClauseAttribute.MODIFICATION_DATE,
-                SearchCriteria.CompareMode.LESS_THAN, upper));
+                SearchCriteria.CompareMode.LESS_THAN_OR_EQUAL, upper));
         List<DataSet> result = generalInformationService.searchForDataSets(sessionToken, sc);
 
         assertThat(
@@ -710,14 +710,14 @@ public class GeneralInformationServiceJsonApiTest extends RemoteApiTestCase
 
         SearchCriteria sc = new SearchCriteria();
         sc.addMatchClause(MatchClause.createAttributeMatch(MatchClauseAttribute.REGISTRATION_DATE,
-                SearchCriteria.CompareMode.MORE_THAN, lowerReg));
+                SearchCriteria.CompareMode.MORE_THAN_OR_EQUAL, lowerReg));
         sc.addMatchClause(MatchClause.createAttributeMatch(MatchClauseAttribute.REGISTRATION_DATE,
-                SearchCriteria.CompareMode.LESS_THAN, upperReg));
+                SearchCriteria.CompareMode.LESS_THAN_OR_EQUAL, upperReg));
 
         sc.addMatchClause(MatchClause.createAttributeMatch(MatchClauseAttribute.MODIFICATION_DATE,
-                SearchCriteria.CompareMode.MORE_THAN, lowerMod));
+                SearchCriteria.CompareMode.MORE_THAN_OR_EQUAL, lowerMod));
         sc.addMatchClause(MatchClause.createAttributeMatch(MatchClauseAttribute.MODIFICATION_DATE,
-                SearchCriteria.CompareMode.LESS_THAN, upperMod));
+                SearchCriteria.CompareMode.LESS_THAN_OR_EQUAL, upperMod));
         List<DataSet> result = generalInformationService.searchForDataSets(sessionToken, sc);
 
         assertThat(
@@ -735,9 +735,9 @@ public class GeneralInformationServiceJsonApiTest extends RemoteApiTestCase
         SearchCriteria sc = new SearchCriteria();
 
         sc.addMatchClause(MatchClause.createAttributeMatch(MatchClauseAttribute.REGISTRATION_DATE,
-                SearchCriteria.CompareMode.MORE_THAN, lower));
+                SearchCriteria.CompareMode.MORE_THAN_OR_EQUAL, lower));
         sc.addMatchClause(MatchClause.createAttributeMatch(MatchClauseAttribute.REGISTRATION_DATE,
-                SearchCriteria.CompareMode.LESS_THAN, upper));
+                SearchCriteria.CompareMode.LESS_THAN_OR_EQUAL, upper));
         List<Sample> result = generalInformationService.searchForSamples(sessionToken, sc);
 
         assertThat(