diff --git a/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.lib.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.lib.js
index ef4a61e1d1..717667fcfb 100644
--- a/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.lib.js
+++ b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.lib.js
@@ -28,12 +28,11 @@ function doclist_getAllNodes(parsedArgs, filterParams, query, totalItemCount)
       requestTotalCountMax = 0,
       paged = false,
       allNodes = [];
-   if (query == "" &&
-       (
-       (filter || "path") == "path" || 
-       (filter || "unfiledRecords") == "unfiledRecords" || 
-       (filter || "holds") == "holds" || 
-       (filter || "transfers") == "transfers"))
+   if ((filter || "path") == "path" || 
+       query == "" &&
+       ((filter || "unfiledRecords") == "unfiledRecords" || 
+        (filter || "holds") == "holds" || 
+        (filter || "transfers") == "transfers"))
    {
       // TODO also add DB filter by "node" (in addition to "path")
       var parentNode = parsedArgs.pathNode;
diff --git a/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-filters.lib.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-filters.lib.js
index d9a34d830a..5742afcc41 100644
--- a/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-filters.lib.js
+++ b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-filters.lib.js
@@ -174,7 +174,8 @@ Filters.getFilterParams = function RecordsManagementFilter_getFilterParams(filte
          break;
 
       case "unfiledRecords":
-
+      
+		  filterParams.query = "";	
     	  break;
 
       default: