diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateStep.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateStep.java
index d323eaa4c3be..dd46393ea572 100644
--- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateStep.java
+++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateStep.java
@@ -846,6 +846,7 @@ public class SelectTemplateStep extends ModuleWizardStep implements SettingsStep
     return myModuleName.getText().trim();
   }
 
+  @TestOnly
   public boolean setSelectedTemplate(String group, String name) {
     final ComparableObject.Impl test = new ComparableObject.Impl(group, name);
     return myTemplatesTree.select(myTreeBuilder, new SimpleNodeVisitor() {
diff --git a/platform/platform-api/src/com/intellij/ui/treeStructure/filtered/FilteringTreeStructure.java b/platform/platform-api/src/com/intellij/ui/treeStructure/filtered/FilteringTreeStructure.java
index bf7592fa78b0..6ec9cc5ff0ed 100644
--- a/platform/platform-api/src/com/intellij/ui/treeStructure/filtered/FilteringTreeStructure.java
+++ b/platform/platform-api/src/com/intellij/ui/treeStructure/filtered/FilteringTreeStructure.java
@@ -21,6 +21,8 @@ import com.intellij.ide.util.treeView.PresentableNodeDescriptor;
 import com.intellij.openapi.util.ActionCallback;
 import com.intellij.ui.speedSearch.ElementFilter;
 import com.intellij.ui.treeStructure.SimpleNode;
+import com.intellij.util.Function;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
@@ -237,7 +239,12 @@ public class FilteringTreeStructure extends AbstractTreeStructure {
     public SimpleNode[] getChildren() {
       List<FilteringNode> nodes = myNodesCache.get(this);
       if (nodes == null) {
-        return myDelegate instanceof SimpleNode ? ((SimpleNode)myDelegate).getChildren() : NO_CHILDREN;
+        return myDelegate instanceof SimpleNode ? ContainerUtil.map(((SimpleNode)myDelegate).getChildren(), new Function<SimpleNode, SimpleNode>() {
+          @Override
+          public SimpleNode fun(SimpleNode node) {
+            return new FilteringNode(FilteringNode.this, node);
+          }
+        }, NO_CHILDREN) : NO_CHILDREN;
       }
 
       ArrayList<FilteringNode> result = new ArrayList<FilteringNode>();