diff --git a/source/java/org/alfresco/web/ui/common/renderer/data/RichListRenderer.java b/source/java/org/alfresco/web/ui/common/renderer/data/RichListRenderer.java
index e60fc2ce94..419fb4e766 100644
--- a/source/java/org/alfresco/web/ui/common/renderer/data/RichListRenderer.java
+++ b/source/java/org/alfresco/web/ui/common/renderer/data/RichListRenderer.java
@@ -203,7 +203,10 @@ public class RichListRenderer extends BaseRenderer
                if (header != null)
                {
                   header.encodeBegin(context);
-                  header.encodeChildren(context);
+                  if (header.getRendersChildren())
+                  {
+                     header.encodeChildren(context);
+                  }
                   header.encodeEnd(context);
                }
                
@@ -266,7 +269,10 @@ public class RichListRenderer extends BaseRenderer
                   if (smallIcon != null)
                   {
                      smallIcon.encodeBegin(context);
-                     smallIcon.encodeChildren(context);
+                     if (smallIcon.getRendersChildren())
+                     {
+                        smallIcon.encodeChildren(context);
+                     }
                      smallIcon.encodeEnd(context);
                      out.write(" ");
                   }
@@ -349,7 +355,7 @@ public class RichListRenderer extends BaseRenderer
       public void renderListBefore(FacesContext context, UIRichList richList, UIColumn[] columns)
             throws IOException
       {
-         ResponseWriter out = context.getResponseWriter();
+//         ResponseWriter out = context.getResponseWriter();
          
          // render column headers as labels
          // TODO: add "showHeaders" to RichList to allow hiding of header facets for some view modes
@@ -446,7 +452,10 @@ public class RichListRenderer extends BaseRenderer
                if (icon != null)
                {
                   icon.encodeBegin(context);
-                  icon.encodeChildren(context);
+                  if (icon.getRendersChildren())
+                  {
+                     icon.encodeChildren(context);
+                  }
                   icon.encodeEnd(context);
                }
                out.write("</td>");
@@ -646,7 +655,10 @@ public class RichListRenderer extends BaseRenderer
                if (largeIcon != null)
                {
                   largeIcon.encodeBegin(context);
-                  largeIcon.encodeChildren(context);
+                  if (largeIcon.getRendersChildren())
+                  {
+                     largeIcon.encodeChildren(context);
+                  }
                   largeIcon.encodeEnd(context);
                }
                out.write("</td>");
diff --git a/source/web/jsp/dialog/checkout-file.jsp b/source/web/jsp/dialog/checkout-file.jsp
index 2200669926..6ac7e2ac7c 100644
--- a/source/web/jsp/dialog/checkout-file.jsp
+++ b/source/web/jsp/dialog/checkout-file.jsp
@@ -148,7 +148,7 @@
                                  <tr>
                                     <td style="padding-left:26px">
                                        <%-- Space selector to allow user to pick a Space --%>
-                                       <r:spaceSelector label="#{msg.select_space_prompt}"
+                                       <r:spaceSelector id="space-selector" label="#{msg.select_space_prompt}"
                                                 value="#{CheckinCheckoutBean.selectedSpaceId}"
                                                 initialSelection="#{NavigationBean.currentNodeId}"
                                                 styleClass="selector"/>
diff --git a/source/web/jsp/dialog/edit-category.jsp b/source/web/jsp/dialog/edit-category.jsp
index ee29e133a9..575f9aecbf 100644
--- a/source/web/jsp/dialog/edit-category.jsp
+++ b/source/web/jsp/dialog/edit-category.jsp
@@ -100,13 +100,15 @@
                                  <tr>
                                     <td><h:outputText value="#{msg.categories}" />:</td>
                                     <td width="98%">
-                                       <r:multiValueListEditor value="#{DocumentDetailsBean.categories}"
+                                       <r:multiValueListEditor id="multi-category-selector"
+                                                               value="#{DocumentDetailsBean.categories}"
                                                                lastItemAdded="#{DocumentDetailsBean.addedCategory}" 
                                                                selectItemMsg="#{msg.select_category}"
                                                                selectedItemsMsg="#{msg.selected_categories}"
                                                                noSelectedItemsMsg="#{msg.no_selected_categories}"
                                                                styleClass="selector">
-                                          <r:categorySelector label="#{msg.select_category_prompt}" styleClass="selector"
+                                          <r:categorySelector id="category-selector" label="#{msg.select_category_prompt}" 
+                                                              styleClass="selector"
                                                               value="#{DocumentDetailsBean.addedCategory}"/>
                                        </r:multiValueListEditor>
                                     </td>
diff --git a/source/web/jsp/wizard/create-action/action-check-out.jsp b/source/web/jsp/wizard/create-action/action-check-out.jsp
index b6b6d55c23..6736656920 100644
--- a/source/web/jsp/wizard/create-action/action-check-out.jsp
+++ b/source/web/jsp/wizard/create-action/action-check-out.jsp
@@ -118,7 +118,7 @@
                                  <tr>
                                     <td><nobr><h:outputText value="#{msg.checkout_location}"/>:</nobr></td>
                                     <td width="100%">
-                                       <r:spaceSelector label="#{msg.select_checkout_prompt}" 
+                                       <r:spaceSelector id="space-selector" label="#{msg.select_checkout_prompt}" 
                                                         value="#{NewActionWizard.actionProperties.destinationLocation}" 
                                                         initialSelection="#{NavigationBean.currentNodeId}"
                                                         styleClass="selector"/>
diff --git a/source/web/jsp/wizard/create-action/action-copy.jsp b/source/web/jsp/wizard/create-action/action-copy.jsp
index 78a565b576..aae7fda570 100644
--- a/source/web/jsp/wizard/create-action/action-copy.jsp
+++ b/source/web/jsp/wizard/create-action/action-copy.jsp
@@ -118,7 +118,7 @@
                                  <tr>
                                     <td><h:outputText value="#{msg.destination}"/>:</td>
                                     <td width="90%">
-                                       <r:spaceSelector label="#{msg.select_destination_prompt}" 
+                                       <r:spaceSelector id="space-selector" label="#{msg.select_destination_prompt}" 
                                                         value="#{NewActionWizard.actionProperties.destinationLocation}" 
                                                         initialSelection="#{NavigationBean.currentNodeId}"
                                                         styleClass="selector"/>
diff --git a/source/web/jsp/wizard/create-action/action-import.jsp b/source/web/jsp/wizard/create-action/action-import.jsp
index 5e45c59577..d91aa46a55 100644
--- a/source/web/jsp/wizard/create-action/action-import.jsp
+++ b/source/web/jsp/wizard/create-action/action-import.jsp
@@ -118,7 +118,7 @@
                                  <tr>
                                     <td><h:outputText value="#{msg.destination}"/>:</td>
                                     <td width="90%">
-                                       <r:spaceSelector label="#{msg.select_destination_prompt}" 
+                                       <r:spaceSelector id="space-selector" label="#{msg.select_destination_prompt}" 
                                                         value="#{NewActionWizard.actionProperties.destinationLocation}" 
                                                         initialSelection="#{NavigationBean.currentNodeId}"
                                                         style="border: 1px dashed #cccccc; padding: 6px;"/>
diff --git a/source/web/jsp/wizard/create-action/action-link-category.jsp b/source/web/jsp/wizard/create-action/action-link-category.jsp
index a58c633694..5e4ec5e04f 100644
--- a/source/web/jsp/wizard/create-action/action-link-category.jsp
+++ b/source/web/jsp/wizard/create-action/action-link-category.jsp
@@ -118,7 +118,7 @@
                                  <tr>
                                     <td valign="top"><h:outputText value="#{msg.category}"/>:</td>
                                     <td width="90%">
-                                       <r:categorySelector label="#{msg.select_category_prompt}" 
+                                       <r:categorySelector id="category-selector" label="#{msg.select_category_prompt}" 
                                                         value="#{NewActionWizard.actionProperties.category}" 
                                                         styleClass="selector"/>
                                     </td>
diff --git a/source/web/jsp/wizard/create-action/action-move.jsp b/source/web/jsp/wizard/create-action/action-move.jsp
index e042fff7de..3bd03c7e07 100644
--- a/source/web/jsp/wizard/create-action/action-move.jsp
+++ b/source/web/jsp/wizard/create-action/action-move.jsp
@@ -118,7 +118,7 @@
                                  <tr>
                                     <td><h:outputText value="#{msg.destination}"/>:</td>
                                     <td width="90%">
-                                       <r:spaceSelector label="#{msg.select_destination_prompt}" 
+                                       <r:spaceSelector id="space-selector" label="#{msg.select_destination_prompt}" 
                                                         value="#{NewActionWizard.actionProperties.destinationLocation}" 
                                                         initialSelection="#{NavigationBean.currentNodeId}"
                                                         styleClass="selector"/>
diff --git a/source/web/jsp/wizard/create-action/action-transform-image.jsp b/source/web/jsp/wizard/create-action/action-transform-image.jsp
index 2949c1340b..fb91af3f4e 100644
--- a/source/web/jsp/wizard/create-action/action-transform-image.jsp
+++ b/source/web/jsp/wizard/create-action/action-transform-image.jsp
@@ -133,7 +133,7 @@
                                  <tr>
                                     <td><h:outputText value="#{msg.destination}"/>:</td>
                                     <td>
-                                       <r:spaceSelector label="#{msg.select_destination_prompt}" 
+                                       <r:spaceSelector id="space-selector" label="#{msg.select_destination_prompt}" 
                                                         value="#{NewActionWizard.actionProperties.destinationLocation}" 
                                                         initialSelection="#{NavigationBean.currentNodeId}"
                                                         styleClass="selector"/>
diff --git a/source/web/jsp/wizard/create-action/action-transform.jsp b/source/web/jsp/wizard/create-action/action-transform.jsp
index 4cdfa5841d..8724af8a0d 100644
--- a/source/web/jsp/wizard/create-action/action-transform.jsp
+++ b/source/web/jsp/wizard/create-action/action-transform.jsp
@@ -127,7 +127,7 @@
                                  <tr>
                                     <td><h:outputText value="#{msg.destination}"/>:</td>
                                     <td>
-                                       <r:spaceSelector label="#{msg.select_destination_prompt}" 
+                                       <r:spaceSelector id="space-selector" label="#{msg.select_destination_prompt}" 
                                                         value="#{NewActionWizard.actionProperties.destinationLocation}" 
                                                         initialSelection="#{NavigationBean.currentNodeId}"
                                                         styleClass="selector"/>
diff --git a/source/web/jsp/wizard/new-rule/action-check-out.jsp b/source/web/jsp/wizard/new-rule/action-check-out.jsp
index 0e8e3e3d24..8210b6fa77 100644
--- a/source/web/jsp/wizard/new-rule/action-check-out.jsp
+++ b/source/web/jsp/wizard/new-rule/action-check-out.jsp
@@ -106,7 +106,7 @@
                                  <tr>
                                     <td><nobr><h:outputText value="#{msg.checkout_location}"/>:</nobr></td>
                                     <td width="100%">
-                                       <r:spaceSelector label="#{msg.select_checkout_prompt}" 
+                                       <r:spaceSelector id="space-selector" label="#{msg.select_checkout_prompt}" 
                                                         value="#{NewRuleWizard.actionProperties.destinationLocation}" 
                                                         initialSelection="#{NavigationBean.currentNodeId}"
                                                         styleClass="selector"/>
diff --git a/source/web/jsp/wizard/new-rule/action-copy.jsp b/source/web/jsp/wizard/new-rule/action-copy.jsp
index 779c3a2fe2..5570a1d8b9 100644
--- a/source/web/jsp/wizard/new-rule/action-copy.jsp
+++ b/source/web/jsp/wizard/new-rule/action-copy.jsp
@@ -106,7 +106,7 @@
                                  <tr>
                                     <td><h:outputText value="#{msg.destination}"/>:</td>
                                     <td width="90%">
-                                       <r:spaceSelector label="#{msg.select_destination_prompt}" 
+                                       <r:spaceSelector id="space-selector" label="#{msg.select_destination_prompt}" 
                                                         value="#{NewRuleWizard.actionProperties.destinationLocation}" 
                                                         initialSelection="#{NavigationBean.currentNodeId}"
                                                         styleClass="selector"/>
diff --git a/source/web/jsp/wizard/new-rule/action-import.jsp b/source/web/jsp/wizard/new-rule/action-import.jsp
index 4cc8ac7172..e5df48e2f0 100644
--- a/source/web/jsp/wizard/new-rule/action-import.jsp
+++ b/source/web/jsp/wizard/new-rule/action-import.jsp
@@ -106,7 +106,8 @@
                                  <tr>
                                     <td><h:outputText value="#{msg.import_to}"/>:</td>
                                     <td width="90%">
-                                       <r:spaceSelector label="#{msg.select_destination_prompt}" 
+                                       <r:spaceSelector id="category-selector"
+                                                        label="#{msg.select_destination_prompt}" 
                                                         value="#{NewRuleWizard.actionProperties.destinationLocation}" 
                                                         initialSelection="#{NavigationBean.currentNodeId}"
                                                         style="border: 1px dashed #cccccc; padding: 6px;"/>
diff --git a/source/web/jsp/wizard/new-rule/action-link-category.jsp b/source/web/jsp/wizard/new-rule/action-link-category.jsp
index 0af8bc38c6..50ba861537 100644
--- a/source/web/jsp/wizard/new-rule/action-link-category.jsp
+++ b/source/web/jsp/wizard/new-rule/action-link-category.jsp
@@ -106,7 +106,7 @@
                                  <tr>
                                     <td valign="top"><h:outputText value="#{msg.category}"/>:</td>
                                     <td width="90%">
-                                       <r:categorySelector label="#{msg.select_category_prompt}" 
+                                       <r:categorySelector id="category-selector" label="#{msg.select_category_prompt}" 
                                                         value="#{NewRuleWizard.actionProperties.category}" 
                                                         styleClass="selector"/>
                                     </td>
diff --git a/source/web/jsp/wizard/new-rule/action-move.jsp b/source/web/jsp/wizard/new-rule/action-move.jsp
index 11c0ee7684..85cbb7bbfa 100644
--- a/source/web/jsp/wizard/new-rule/action-move.jsp
+++ b/source/web/jsp/wizard/new-rule/action-move.jsp
@@ -106,7 +106,7 @@
                                  <tr>
                                     <td><h:outputText value="#{msg.destination}"/>:</td>
                                     <td width="90%">
-                                       <r:spaceSelector label="#{msg.select_destination_prompt}" 
+                                       <r:spaceSelector id="space-selector" label="#{msg.select_destination_prompt}" 
                                                         value="#{NewRuleWizard.actionProperties.destinationLocation}" 
                                                         initialSelection="#{NavigationBean.currentNodeId}"
                                                         styleClass="selector"/>
diff --git a/source/web/jsp/wizard/new-rule/action-transform-image.jsp b/source/web/jsp/wizard/new-rule/action-transform-image.jsp
index fecac687b7..89086ee3e2 100644
--- a/source/web/jsp/wizard/new-rule/action-transform-image.jsp
+++ b/source/web/jsp/wizard/new-rule/action-transform-image.jsp
@@ -121,7 +121,7 @@
                                  <tr>
                                     <td><h:outputText value="#{msg.destination}"/>:</td>
                                     <td>
-                                       <r:spaceSelector label="#{msg.select_destination_prompt}" 
+                                       <r:spaceSelector id="space-selector" label="#{msg.select_destination_prompt}" 
                                                         value="#{NewRuleWizard.actionProperties.destinationLocation}" 
                                                         initialSelection="#{NavigationBean.currentNodeId}"
                                                         styleClass="selector"/>
diff --git a/source/web/jsp/wizard/new-rule/action-transform.jsp b/source/web/jsp/wizard/new-rule/action-transform.jsp
index b9400d6353..8bb3077f3d 100644
--- a/source/web/jsp/wizard/new-rule/action-transform.jsp
+++ b/source/web/jsp/wizard/new-rule/action-transform.jsp
@@ -115,7 +115,7 @@
                                  <tr>
                                     <td><h:outputText value="#{msg.destination}"/>:</td>
                                     <td>
-                                       <r:spaceSelector label="#{msg.select_destination_prompt}" 
+                                       <r:spaceSelector id="space-selector" label="#{msg.select_destination_prompt}" 
                                                         value="#{NewRuleWizard.actionProperties.destinationLocation}" 
                                                         initialSelection="#{NavigationBean.currentNodeId}"
                                                         styleClass="selector"/>
diff --git a/source/web/jsp/wizard/new-rule/condition-in-category.jsp b/source/web/jsp/wizard/new-rule/condition-in-category.jsp
index 7711e476b8..79c0df7329 100644
--- a/source/web/jsp/wizard/new-rule/condition-in-category.jsp
+++ b/source/web/jsp/wizard/new-rule/condition-in-category.jsp
@@ -106,7 +106,7 @@
                                  <tr>
                                     <td valign="top"><h:outputText value="#{msg.category}"/>:</td>
                                     <td width="90%">
-                                       <r:categorySelector label="#{msg.select_category_prompt}" 
+                                       <r:categorySelector id="category-selector" label="#{msg.select_category_prompt}" 
                                                         value="#{NewRuleWizard.conditionProperties.category}" 
                                                         styleClass="selector"/>
                                     </td>
diff --git a/source/web/jsp/wizard/new-space/from-existing.jsp b/source/web/jsp/wizard/new-space/from-existing.jsp
index 3d54d1c712..25f4bbc2e1 100644
--- a/source/web/jsp/wizard/new-space/from-existing.jsp
+++ b/source/web/jsp/wizard/new-space/from-existing.jsp
@@ -125,7 +125,7 @@
                                  <tr><td class="paddingRow"></td></tr>
                                  <tr>
                                     <td>
-                                       <r:spaceSelector label="#{msg.select_existing_space_prompt}" 
+                                       <r:spaceSelector id="space-selector" label="#{msg.select_existing_space_prompt}" 
                                                         value="#{NewSpaceWizard.existingSpaceId}" 
                                                         initialSelection="#{NavigationBean.currentNodeId}"
                                                         styleClass="selector" />
diff --git a/source/web/jsp/wizard/new-user/user-properties.jsp b/source/web/jsp/wizard/new-user/user-properties.jsp
index b20b749346..5fd101a5a2 100644
--- a/source/web/jsp/wizard/new-user/user-properties.jsp
+++ b/source/web/jsp/wizard/new-user/user-properties.jsp
@@ -196,7 +196,7 @@
                                  <tr>
                                     <td><h:outputText value="#{msg.home_space_location}"/>:</td>
                                     <td>
-                                       <r:spaceSelector label="#{msg.select_home_space_prompt}" value="#{NewUserWizard.homeSpaceLocation}" initialSelection="#{NavigationBean.currentNodeId}" style="border: 1px dashed #cccccc; padding: 2px;"/>
+                                       <r:spaceSelector id="space-selector" label="#{msg.select_home_space_prompt}" value="#{NewUserWizard.homeSpaceLocation}" initialSelection="#{NavigationBean.currentNodeId}" style="border: 1px dashed #cccccc; padding: 2px;"/>
                                     </td>
                                  </tr>
                                  <tr>