diff --git a/source/java/org/alfresco/repo/template/NamePathResultsMap.java b/source/java/org/alfresco/repo/template/NamePathResultsMap.java
index 7dcdbd17f7..896d670638 100644
--- a/source/java/org/alfresco/repo/template/NamePathResultsMap.java
+++ b/source/java/org/alfresco/repo/template/NamePathResultsMap.java
@@ -54,8 +54,8 @@ public final class NamePathResultsMap extends BasePathResultsMap implements Clon
                 xpath.append('/');
             }
             xpath.append("*[@cm:name='")
-            .append(t.nextToken())   // TODO: escape quotes?
-            .append("']");
+                 .append(t.nextToken())   // TODO: use QueryParameterDefinition see FileFolderService.search()
+                 .append("']");
         }
         
         List<TemplateNode> nodes = getChildrenByXPath(xpath.toString(), true);