diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/OrderTranslator.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/OrderTranslator.java
index bc060f189b2143929be0d53de46d436932ae1623..e159bca8c883f67246625d2eab5892a58739e4dc 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/OrderTranslator.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/OrderTranslator.java
@@ -150,13 +150,12 @@ public class OrderTranslator
             {
                 final String fullPropertyName = sortingCriteriaFieldName.substring(
                         EntityWithPropertiesSortOptions.PROPERTY.length());
-                final boolean internalProperty = TranslatorUtils.isPropertyInternal(fullPropertyName);
                 final String attributeTypesTableAlias = aliases.get(fullPropertyName.toLowerCase())
                         .get(TableNames.DATA_TYPES_TABLE).getMainTableAlias();
 
                 sqlBuilder.append(SP).append(AND).append(SP);
                 TranslatorUtils.appendInternalExternalConstraint(sqlBuilder, args, attributeTypesTableAlias,
-                        internalProperty);
+                        TranslatorUtils.isPropertyInternal(fullPropertyName));
 
                 sqlBuilder.append(SP).append(AND).append(SP).append(attributeTypesTableAlias).append(PERIOD)
                         .append(CODE_COLUMN).append(SP).append(EQ).append(SP).append(QU);
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/DateFieldSearchConditionTranslator.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/DateFieldSearchConditionTranslator.java
index dd60e1951b633904c9b3efec2028c2ae2c689770..2b128efe59aa31731b567cf7fa5a50c03f1ee17d 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/DateFieldSearchConditionTranslator.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/DateFieldSearchConditionTranslator.java
@@ -208,9 +208,8 @@ public class DateFieldSearchConditionTranslator implements IConditionTranslator<
 
         if (fullPropertyName != null)
         {
-            final boolean internalProperty = TranslatorUtils.isPropertyInternal(fullPropertyName);
             TranslatorUtils.appendInternalExternalConstraint(sqlBuilder, args, entityTypesSubTableAlias,
-                    internalProperty);
+                    TranslatorUtils.isPropertyInternal(fullPropertyName));
             sqlBuilder.append(SP).append(AND).append(SP);
             sqlBuilder.append(aliases.get(tableMapper.getAttributeTypesTable()).getSubTableAlias())
                     .append(PERIOD).append(ColumnNames.CODE_COLUMN).append(SP).append(EQ).append(SP).append(QU);