diff --git a/source/java/org/alfresco/web/bean/groups/GroupsDialog.java b/source/java/org/alfresco/web/bean/groups/GroupsDialog.java
index 8e1255a7d8..0ae0bae8d3 100644
--- a/source/java/org/alfresco/web/bean/groups/GroupsDialog.java
+++ b/source/java/org/alfresco/web/bean/groups/GroupsDialog.java
@@ -448,10 +448,11 @@ public class GroupsDialog extends BaseDialogBean
          }
          else
          {
-            if (search != null && search.startsWith("*"))
+            boolean immediate = (this.filterMode.equals(FILTER_CHILDREN));
+            if ((search != null && search.startsWith("*")) || immediate)
             {
-               // if the search term starts with a wildcard use Lucene based search to find groups (results will be inconsistent)
-               boolean immediate = (this.filterMode.equals(FILTER_CHILDREN));
+               // if the search term starts with a wildcard or is for immediate children only then use Solr/Lucene based search query to find groups (note:
+               // results will be eventually consistent if using Solr, rather than embedded Lucene)
                Set<String> results = this.authService.findAuthorities(AuthorityType.GROUP, this.group, immediate, search, AuthorityService.ZONE_APP_DEFAULT);
                authorities = new ArrayList<String>(results);
             }
diff --git a/source/web/jsp/content/create-content-wizard/create-html.jsp b/source/web/jsp/content/create-content-wizard/create-html.jsp
index d1c302a39b..9477a28c17 100644
--- a/source/web/jsp/content/create-content-wizard/create-html.jsp
+++ b/source/web/jsp/content/create-content-wizard/create-html.jsp
@@ -42,10 +42,10 @@
       theme_advanced_toolbar_location : "top",
       theme_advanced_toolbar_align : "left",
       theme_advanced_buttons1_add : "fontselect,fontsizeselect",
-      theme_advanced_buttons2_add : "separator,forecolor,backcolor",
+      theme_advanced_buttons2_add : "separator,forecolor",
       theme_advanced_buttons3_add_before : "tablecontrols,separator",
       theme_advanced_disable: "styleselect",
-      extended_valid_elements : "a[href|target|name],font[face|size|color|style],span[class|align|style]"
+      extended_valid_elements : "a[href|target|name],font[face|size|color|style],span[class|align|style],p[align]"
    });
    
    function saveContent(id, content)
diff --git a/source/web/jsp/content/edit-html-inline.jsp b/source/web/jsp/content/edit-html-inline.jsp
index 286c6c6514..d62a79567a 100644
--- a/source/web/jsp/content/edit-html-inline.jsp
+++ b/source/web/jsp/content/edit-html-inline.jsp
@@ -45,10 +45,10 @@ tinyMCE.init({
    theme_advanced_toolbar_location : "top",
    theme_advanced_toolbar_align : "left",
    theme_advanced_buttons1_add : "fontselect,fontsizeselect",
-   theme_advanced_buttons2_add : "separator,forecolor,backcolor",
+   theme_advanced_buttons2_add : "separator,forecolor",
    theme_advanced_buttons3_add_before : "tablecontrols,separator",
    theme_advanced_disable: "styleselect",
-   extended_valid_elements : "a[href|target|name],font[face|size|color|style],span[class|align|style]"
+   extended_valid_elements : "a[href|target|name],font[face|size|color|style],span[class|align|style],p[align]"
 });
 
 function saveContent(id, content)