diff --git a/config/alfresco/templates/webscripts/org/alfresco/collaboration/tagQuery.get.js b/config/alfresco/templates/webscripts/org/alfresco/collaboration/tagQuery.get.js
index eecb004c58..f90e271ea2 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/collaboration/tagQuery.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/collaboration/tagQuery.get.js
@@ -36,12 +36,17 @@ function tagQuery()
    }
    
    /* Query for tagged node(s) */
-   var query = "PATH:\"" + node.qnamePath;
-   if (node.isContainer)
+   var query = "";
+   if (node !== companyhome)
    {
-      query += "//*";
+      query = "PATH:\"" + node.qnamePath;
+      if (node.isContainer)
+      {
+         query += "//*";
+      }
+      query += "\" AND ";
    }
-   query += "\" AND ASPECT:\"{http://www.alfresco.org/model/content/1.0}taggable\"";
+   query += "ASPECT:\"{http://www.alfresco.org/model/content/1.0}taggable\"";
    
    var taggedNodes = search.luceneSearch(query);
 
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 3277d9b214..53c9fcb579 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
@@ -152,18 +152,16 @@ var Filters =
             break;
 
          case "editingMe":
-            filterQuery = this.constructPathQuery(parsedArgs);
-            filterQuery += " +((+ASPECT:\"workingcopy\"";
-            filterQuery += " +@cm\\:workingCopyOwner:\"" + person.properties.userName + '")';
+            filterQuery = this.constructPathQuery(parsedArgs, true);
+            filterQuery += " +((+@cm\\:workingCopyOwner:\"" + person.properties.userName + '")';
             filterQuery += " OR (+@cm\\:lockOwner:\"" + person.properties.userName + '"';
             filterQuery += " +@cm\\:lockType:\"WRITE_LOCK\"))";
             filterParams.query = filterQuery;
             break;
 
          case "editingOthers":
-            filterQuery = this.constructPathQuery(parsedArgs);
-            filterQuery += " +((+ASPECT:\"workingcopy\"";
-            filterQuery += " -@cm\\:workingCopyOwner:\"" + person.properties.userName + '")';
+            filterQuery = this.constructPathQuery(parsedArgs, true);
+            filterQuery += " +((-@cm\\:workingCopyOwner:\"" + person.properties.userName + '")';
             filterQuery += " OR (-@cm\\:lockOwner:\"" + person.properties.userName + '"';
             filterQuery += " +@cm\\:lockType:\"WRITE_LOCK\"))";
             filterParams.query = filterQuery;
@@ -238,12 +236,12 @@ var Filters =
       return filterParams;
    },
    
-   constructPathQuery: function constructPathQuery(parsedArgs)
+   constructPathQuery: function constructPathQuery(parsedArgs, cmonly)
    {
       var pathQuery = "";
       if (parsedArgs.nodeRef != "alfresco://company/home")
       {
-         pathQuery = '+PATH:"' + parsedArgs.rootNode.qnamePath + '//cm:*"';
+         pathQuery = '+PATH:"' + parsedArgs.rootNode.qnamePath + '//' + (cmonly ? 'cm:' : '') + '*"';
       }
       return pathQuery;
    }
diff --git a/source/java/org/alfresco/repo/web/scripts/bean/Login.java b/source/java/org/alfresco/repo/web/scripts/bean/Login.java
index eedb03b545..8f985961ae 100644
--- a/source/java/org/alfresco/repo/web/scripts/bean/Login.java
+++ b/source/java/org/alfresco/repo/web/scripts/bean/Login.java
@@ -55,6 +55,16 @@ public class Login extends AbstractLoginBean
             throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, "Password not specified");
         }
 
-        return login(username, password);
+        try
+        {
+            return login(username, password);
+        }
+        catch(WebScriptException e)
+        {
+            status.setCode(e.getStatus());
+            status.setMessage(e.getMessage());
+            status.setRedirect(true);
+            return null;
+        }
     }
 }
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/web/scripts/bean/LoginPost.java b/source/java/org/alfresco/repo/web/scripts/bean/LoginPost.java
index 0de22b80fc..c20b98f123 100644
--- a/source/java/org/alfresco/repo/web/scripts/bean/LoginPost.java
+++ b/source/java/org/alfresco/repo/web/scripts/bean/LoginPost.java
@@ -70,7 +70,17 @@ public class LoginPost extends AbstractLoginBean
                 throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, "Password not specified");
             }
 
-            return login(username, password);
+            try
+            {
+                return login(username, password);
+            }
+            catch(WebScriptException e)
+            {
+                status.setCode(e.getStatus());
+                status.setMessage(e.getMessage());
+                status.setRedirect(true);
+                return null;
+            }
         } 
         catch (JSONException jErr)
         {