diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java
index 8e299d9b5c8e40a3cced4a65d3a1367d7f9921c4..ff61802effdebac136c6b7bbfca2f5a539b69388 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java
@@ -398,7 +398,8 @@ public class DatasetDownloadServlet extends AbstractDatasetDownloadServlet
         }
         //
 
-        boolean isLinkData = request.getParameter(IS_LINK_DATASET).equals("true");
+        String isLink = request.getParameter(IS_LINK_DATASET);
+        boolean isLinkData = "true".equals(isLink);
 
         return new RequestParams(dataSetCode, pathInfo, sessionIDOrNull, urlPrefixWithDataset,
                 displayMode, autoResolve, mainDataSetPathOrNull, mainDataSetPatternOrNull,
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java
index cbc9ec145c2d1f1b8aa945541b4064449aa63237..08cd3e8fad6209623f5f412eef3c0f1ef30b8f61 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java
@@ -1195,7 +1195,7 @@ public class DatasetLister extends AbstractLister implements IDatasetLister
             } else
             {
                 copies.add(new FileSystemContentCopy(copyRecord.edms_code, copyRecord.edms_label, copyRecord.edms_address, copyRecord.edms_address,
-                        copyRecord.hash, copyRecord.path));
+                        copyRecord.path, copyRecord.hash));
             }
             linkDataSet.setExternalDataManagementSystem(externalDataManagementSystems
                     .get(copyRecord.edms_id));