diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchCreateItemPane.java b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchCreateItemPane.java
index 11b58b5cc..72871fda8 100644
--- a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchCreateItemPane.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchCreateItemPane.java
@@ -90,9 +90,7 @@ class ItemSearchCreateItemPane extends CMSContainer
     private final NewItemForm m_newItem = new SectionNewItemForm("newItem");
     // private final SingleSelectionModel m_model;
     private SingleSelectionModel m_model;
-    private final FolderSelectionModel m_folderSel; // To support legacy UI code    
-    // private FolderSelectionModel m_folderSel; // To support legacy UI code    
-    // private final CreationSelector m_creator;
+    private final FolderSelectionModel m_folderSel;
     private CreationSelector m_creator;
     private final FlatFolderPicker m_folderPicker = new FlatFolderPicker(FLAT_FOLDER);
 
diff --git a/ccm-navigation/src/com/arsdigita/navigation/ui/category/AbstractTree.java b/ccm-navigation/src/com/arsdigita/navigation/ui/category/AbstractTree.java
index 1b380f8ce..9de4cf13f 100755
--- a/ccm-navigation/src/com/arsdigita/navigation/ui/category/AbstractTree.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/category/AbstractTree.java
@@ -131,7 +131,6 @@ public abstract class AbstractTree extends CategoryComponent {
         }
         
 
-
         s_log.debug("generating node XML for category " + cat.getName());
 
         // replace idPath list with one containing cat.id appended
diff --git a/ccm-navigation/src/com/arsdigita/navigation/ui/object/CategoryFilter.java b/ccm-navigation/src/com/arsdigita/navigation/ui/object/CategoryFilter.java
index 678a92d35..5839a8c26 100644
--- a/ccm-navigation/src/com/arsdigita/navigation/ui/object/CategoryFilter.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/object/CategoryFilter.java
@@ -141,15 +141,17 @@ public class CategoryFilter {
         final Element elem = new Element("category");
         elem.addAttribute("id", category.getID().toString());
         if (multiple) {
-        if ((values != null) && !values.isEmpty() && values.contains(category.getName())) {
-            elem.addAttribute("selected", "selected");
-            if (searchString.length() > 0) {
-                searchString.append(' ');
+            if ((values != null) && !values.isEmpty() && values.contains(category.getName())) {
+                elem.addAttribute("selected", "selected");
+//                if (searchString.length() > 0) {
+//                    searchString.append(separator);
+//                }
+                searchString.append(category.getName());
+                searchString.append(separator);
             }
-            searchString.append(category.getName());
-        }
         } else {
-            if ((values != null) && !values.isEmpty() && values.contains(category.getID().toString())) {
+            if ((values != null) && !values.isEmpty() && values.
+                    contains(category.getID().toString())) {
                 elem.addAttribute("selected", "selected");
             }
         }