diff --git a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/assets.html.ftl b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/assets.html.ftl
index d8c0413a7..f9f8b1b40 100644
--- a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/assets.html.ftl
+++ b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/assets.html.ftl
@@ -3,7 +3,7 @@
 </#macro>
 
 <#macro "org.librecms.assets.FileAsset" asset>
-    <h3><a href="${asset.assetPath}">${asset.title}</a></h3>
+    <h3><a href="/content-sections/${asset.contentSection}/files${asset.assetPath}">${asset.title}</a></h3>
     <p>${asset.description}</p>
     <small>${asset.mimeType} ${asset.size} Bytes</small>
     <#--  <p><code>A file asset</code></p>  -->
diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/rs/Files.java b/ccm-cms/src/main/java/org/librecms/contentsection/rs/Files.java
index 14135e8b0..f44bc6db4 100644
--- a/ccm-cms/src/main/java/org/librecms/contentsection/rs/Files.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/rs/Files.java
@@ -32,6 +32,7 @@ import java.util.Optional;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
+import javax.transaction.Transactional;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
@@ -44,7 +45,7 @@ import javax.ws.rs.core.StreamingOutput;
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
-@Path("/{content-section}/files")
+@Path("/{content-section}/files/")
 public class Files {
 
     private static final Logger LOGGER = LogManager.getLogger(Files.class);
@@ -60,6 +61,7 @@ public class Files {
 
     @GET
     @Path("/uuid-{uuid}")
+    @Transactional(Transactional.TxType.REQUIRED)
     public Response getFileByUuid(
         @PathParam("content-section") final String sectionName,
         @PathParam("uuid") final String uuid
@@ -82,7 +84,9 @@ public class Files {
     }
 
     @GET
-    @Path("/{path:^(?!uuid).+$}")
+    //@Path("/{path:^(?!uuid).+$}")
+    @Path("/{path:.+}")
+    @Transactional(Transactional.TxType.REQUIRED)
     public Response getFile(
         @PathParam("content-section") final String sectionName,
         @PathParam("path") final String path
diff --git a/ccm-cms/src/main/java/org/librecms/pages/models/AbstractBinaryAssetModelBuilder.java b/ccm-cms/src/main/java/org/librecms/pages/models/AbstractBinaryAssetModelBuilder.java
index aa9eb03d6..af47bf3e7 100644
--- a/ccm-cms/src/main/java/org/librecms/pages/models/AbstractBinaryAssetModelBuilder.java
+++ b/ccm-cms/src/main/java/org/librecms/pages/models/AbstractBinaryAssetModelBuilder.java
@@ -21,6 +21,7 @@ package org.librecms.pages.models;
 import org.libreccm.l10n.GlobalizationHelper;
 import org.librecms.assets.BinaryAsset;
 import org.librecms.contentsection.AssetManager;
+import org.librecms.contentsection.Folder;
 
 import javax.inject.Inject;
 import javax.transaction.Transactional;
@@ -46,6 +47,12 @@ public abstract class AbstractBinaryAssetModelBuilder<T extends BinaryAsset, M e
         super.addProperties(asset, model);
         model.setAssetPath(assetManager.getAssetPath(asset));
         model.setBinaryAssetUuid(asset.getUuid());
+        model.setContentSection(
+            assetManager
+                .getAssetFolder(asset)
+                .map(folder -> folder.getSection().getDisplayName())
+                .orElse("")
+        );
         model.setDescription(
             globalizationHelper.getValueFromLocalizedString(
                 asset.getDescription()
diff --git a/ccm-cms/src/main/java/org/librecms/pages/models/BinaryAssetModel.java b/ccm-cms/src/main/java/org/librecms/pages/models/BinaryAssetModel.java
index cc1dcc62b..578e0f81f 100644
--- a/ccm-cms/src/main/java/org/librecms/pages/models/BinaryAssetModel.java
+++ b/ccm-cms/src/main/java/org/librecms/pages/models/BinaryAssetModel.java
@@ -27,17 +27,19 @@ import org.librecms.assets.BinaryAsset;
 public class BinaryAssetModel extends AbstractAssetModel {
 
     private String description;
-    
+
     private String fileName;
-    
+
     private String mimeType;
-    
+
     private long size;
-    
+
     private String binaryAssetUuid;
-    
+
+    private String contentSection;
+
     private String assetPath;
-    
+
     @Override
     public String getType() {
         return BinaryAsset.class.getName();
@@ -83,6 +85,14 @@ public class BinaryAssetModel extends AbstractAssetModel {
         this.binaryAssetUuid = binaryAssetUuid;
     }
 
+    public String getContentSection() {
+        return contentSection;
+    }
+
+    public void setContentSection(final String contentSection) {
+        this.contentSection = contentSection;
+    }
+
     public String getAssetPath() {
         return assetPath;
     }
@@ -90,9 +100,5 @@ public class BinaryAssetModel extends AbstractAssetModel {
     public void setAssetPath(final String assetPath) {
         this.assetPath = assetPath;
     }
-    
-   
-    
-    
-    
+
 }