diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/EntitiesFinder.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/EntitiesFinder.java
index b24ba3eed57c4f2518d261ff93cd827bdfbb0bd7..3ef57e9805b71e57cfa434fa960dc3792a8f7c7a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/EntitiesFinder.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/EntitiesFinder.java
@@ -213,23 +213,28 @@ class EntitiesFinder
         final List<SamplePermId> samplePermIds = permIds.stream().map(SamplePermId::new)
                 .collect(Collectors.toList());
         final SampleFetchOptions fetchOptions = new SampleFetchOptions();
+        configureFetchOptions(fetchOptions);
+        configureFetchOptions(fetchOptions.withParents());
+        configureFetchOptions(fetchOptions.withChildren());
+
+        final DataSetFetchOptions dataSetFetchOptions = fetchOptions.withDataSets();
+        configureFetchOptions(dataSetFetchOptions);
+
+        return api.getSamples(sessionToken, samplePermIds, fetchOptions).values();
+    }
+
+    private static void configureFetchOptions(final SampleFetchOptions fetchOptions)
+    {
         final ExperimentFetchOptions experimentFetchOptions = fetchOptions.withExperiment();
         experimentFetchOptions.withProperties();
         experimentFetchOptions.withProject().withSpace();
         fetchOptions.withSpace();
         fetchOptions.withProject().withSpace();
-        fetchOptions.withParents().withProperties();
-        fetchOptions.withChildren().withProperties();
         fetchOptions.withType().withPropertyAssignments().withPropertyType();
         fetchOptions.withProperties();
         fetchOptions.withRegistrator();
         fetchOptions.withModifier();
         fetchOptions.withContainer();
-
-        final DataSetFetchOptions dataSetFetchOptions = fetchOptions.withDataSets();
-        configureFetchOptions(dataSetFetchOptions);
-
-        return api.getSamples(sessionToken, samplePermIds, fetchOptions).values();
     }
 
     private static void configureFetchOptions(final DataSetFetchOptions dataSetFetchOptions)