diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.js
index 0a252c0929..716b55e8b3 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.js
@@ -1,3 +1,7 @@
+/*
+JavaException: org.springframework.dao.DataIntegrityViolationException: could not update: [org.alfresco.repo.domain.hibernate.ChildAssocImpl#567]; nested exception is org.hibernate.exception.ConstraintViolationException: could not update: [org.alfresco.repo.domain.hibernate.ChildAssocImpl#567]
+*/
+
 /**
  * Document List Component: doclist
  *
@@ -24,8 +28,7 @@ function getDoclist(siteId, path, type)
          return jsonError("Site not found: " + siteId);
       }
    
-      // var parentNode = site.getComponentContainer("documentLibrary");
-      var parentNode = companyhome; // TODO: Remove hack
+      var parentNode = site.getContainer("documentLibrary");
       if (parentNode === null)
       {
          return jsonError("Document Library container not found in: " + siteId);
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.json.ftl
index 94ce96a09b..d1d5f4e8cf 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.json.ftl
@@ -28,8 +28,7 @@
             "modifiedBy": "${d.properties.modifier}",
             "size": "${d.size}",
             "version": "${version}"
-         }
-         <#if d_has_next>,</#if>
+         }<#if d_has_next>,</#if>
       </#list>
       ]
 </#if>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/treenode.get.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/treenode.get.js
index 97d67d21f4..dcd9580778 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/treenode.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/treenode.get.js
@@ -24,8 +24,7 @@ function getTreenode(siteId, path)
          return jsonError("Site not found: " + siteId);
       }
    
-      // var parentNode = site.getComponentContainer("documentLibrary");
-      var parentNode = companyhome; // TODO: Remove hack
+      var parentNode = site.getContainer("documentLibrary");
       if (parentNode === null)
       {
          return jsonError("Document Library container not found in: " + siteId);