diff --git a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
index 1b78747afa..559cfe88c6 100644
--- a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
+++ b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
@@ -69,7 +69,7 @@ public class FileFolderServiceImpl implements FileFolderService
         "[like(@cm:name, $cm:name, false)" +
         " and not (subtypeOf('" + ContentModel.TYPE_SYSTEM_FOLDER + "'))" +
         " and (subtypeOf('" + ContentModel.TYPE_FOLDER + "') or subtypeOf('" + ContentModel.TYPE_CONTENT + "')" +
-        " and subtypeOf('" + ContentModel.TYPE_LINK + "'))]";
+        " or subtypeOf('" + ContentModel.TYPE_LINK + "'))]";
     
     /** Shallow search for all files and folders */
     private static final String LUCENE_QUERY_SHALLOW_ALL =
@@ -99,7 +99,7 @@ public class FileFolderServiceImpl implements FileFolderService
         "[like(@cm:name, $cm:name, false)" +
         " and not (subtypeOf('" + ContentModel.TYPE_SYSTEM_FOLDER + "'))" +
         " and (subtypeOf('" + ContentModel.TYPE_FOLDER + "') or subtypeOf('" + ContentModel.TYPE_CONTENT + "')" +
-        " and subtypeOf('" + ContentModel.TYPE_LINK + "'))]";
+        " or subtypeOf('" + ContentModel.TYPE_LINK + "'))]";
     
     /** empty parameters */
     private static final QueryParameterDefinition[] PARAMS_ANY_NAME = new QueryParameterDefinition[1];