diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApi.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApi.java
index 5ce0bfcf2b82d88fe6509c45655627d4347a50d4..dd1ccd773572782152adaf33e8193d7288410357 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApi.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApi.java
@@ -15,6 +15,7 @@
  */
 package ch.ethz.sis.openbis.generic.dss.api.v3;
 
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.log4j.Logger;
@@ -97,7 +98,7 @@ public class DataStoreServerApi extends AbstractDssServiceRpc<IDataStoreServerAp
     @Override
     public List<DataSetFile> searchFiles(String sessionToken, FileSearchCriterion searchCriterion)
     {
-        return null;
+        return Collections.emptyList();
     }
 
     @Override
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApiLogger.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApiLogger.java
index d362bee2339f154e655a9eface11bd3748142246..f70aec82d271e98ea9b7db3426d3e2230ad4a201 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApiLogger.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApiLogger.java
@@ -30,8 +30,8 @@ public class DataStoreServerApiLogger extends AbstractServerLogger implements
     @Override
     public List<DataSetFile> searchFiles(String sessionToken, FileSearchCriterion searchCriterion)
     {
-        System.out.println("search files");
-        return null; // TODO kuba implement this method
+        logAccess(sessionToken, "search-files", "SEARCH_CRITERION:\n%s\n", searchCriterion);
+        return null;
     }
 
 }
\ No newline at end of file
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApiServer.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApiServer.java
index cf622df51b9b9177b32375eba65be29f3020749a..80e639b58d01675f04b3995b5311a43412d39314 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApiServer.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApiServer.java
@@ -42,7 +42,6 @@ public class DataStoreServerApiServer extends AbstractApiServiceExporter
     @Override
     public void afterPropertiesSet()
     {
-        System.err.println("After properties set of datastore server server " + service);
         establishService(IDataStoreServerApi.class, service, IDataStoreServerApi.SERVICE_NAME,
                 IDataStoreServerApi.SERVICE_URL);
         super.afterPropertiesSet();