diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdater.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdater.java
index f98ce145a6aed3ca9f93d2a83fb16e8ef21c235f..5f1ca00eabd1e1ce0be066a8bb72acc6e4e3c2f4 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdater.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdater.java
@@ -111,7 +111,8 @@ public class HierarchicalStorageUpdater implements IMaintenanceTask
         {
             File targetFile =
                     new File(hierarchyRoot, DataSetHierarchyHelper.createHierarchicalPath(dataSet));
-            File sourceFile = new File(storeRoot, dataSet.getDataSetLocation());
+            File share = new File(storeRoot, dataSet.getDataSetShareId());
+            File sourceFile = new File(share, dataSet.getDataSetLocation());
             linkMappings.put(targetFile.getAbsolutePath(), sourceFile.getAbsolutePath());
         }
         return linkMappings;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
index 5be821b47f4044e14a5e6bf3b12c47dbe6670ba1..c942cb1dab4cab7935f1d1faf8618cfaca43233e 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
@@ -362,10 +362,18 @@ public final class EncapsulatedOpenBISService implements IEncapsulatedOpenBISSer
         service.checkSpaceAccess(sToken, spaceId);
     }
 
-    public List<SimpleDataSetInformationDTO> listDataSets()
-            throws UserFailureException
+    public List<SimpleDataSetInformationDTO> listDataSets() throws UserFailureException
     {
-        return service.listDataSets(session.getToken(), session.getDataStoreCode());
+        List<SimpleDataSetInformationDTO> dataSets =
+                service.listDataSets(session.getToken(), session.getDataStoreCode());
+        for (SimpleDataSetInformationDTO dataSet : dataSets)
+        {
+            if (dataSet.getDataSetShareId() == null)
+            {
+                dataSet.setDataSetShareId(defaultShareId);
+            }
+        }
+        return dataSets;
     }
 
     public List<ExternalData> listAvailableDataSets(ArchiverDataSetCriteria criteria)