diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/filters.lib.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/filters.lib.js
index 2e2a884508..36e7663869 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/filters.lib.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/filters.lib.js
@@ -22,6 +22,8 @@ function getFilterParams(filter, parsedArgs)
       case "all":
          var filterQuery = "+PATH:\"" + parsedArgs.rootNode.qnamePath + "//*\"";
          filterQuery += " -TYPE:\"{http://www.alfresco.org/model/content/1.0}thumbnail\"";
+         filterQuery += " -TYPE:\"{http://www.alfresco.org/model/content/1.0}folder\"";
+         filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}forums\"";
          filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}forum\"";
          filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}topic\"";
          filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}post\"";
@@ -71,6 +73,8 @@ function getFilterParams(filter, parsedArgs)
          filterQuery += " +@cm\\:" + dateField + ":[" + fromQuery + "T00\\:00\\:00.000 TO " + toQuery + "T23\\:59\\:59.999]";
          filterQuery += " -ASPECT:\"{http://www.alfresco.org/model/content/1.0}workingcopy\"";
          filterQuery += " -TYPE:\"{http://www.alfresco.org/model/content/1.0}thumbnail\"";
+         filterQuery += " -TYPE:\"{http://www.alfresco.org/model/content/1.0}folder\"";
+         filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}forums\"";
          filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}forum\"";
          filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}topic\"";
          filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}post\"";
@@ -102,6 +106,7 @@ function getFilterParams(filter, parsedArgs)
       default:
          var filterQuery = "+PATH:\"" + parsedArgs.parentNode.qnamePath + "/*\"";
          filterQuery += " -ASPECT:\"{http://www.alfresco.org/model/content/1.0}workingcopy\"";
+         filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}forums\"";
          
          filterParams.query = filterQuery;
          break;
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 d0575c2183..0fadb68eda 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
@@ -22,7 +22,7 @@ function getTreenode(siteId, path)
       // Look for folders in the parentNode
       for each(item in parsedArgs.parentNode.children)
       {
-         if (item.isContainer)
+         if (item.type == "{http://www.alfresco.org/model/content/1.0}folder")
          {
             items.push(item);
          }