diff --git a/source/java/org/alfresco/web/ui/repo/component/BaseAjaxItemPicker.java b/source/java/org/alfresco/web/ui/repo/component/BaseAjaxItemPicker.java
index 40e280ddd6..83444d0317 100644
--- a/source/java/org/alfresco/web/ui/repo/component/BaseAjaxItemPicker.java
+++ b/source/java/org/alfresco/web/ui/repo/component/BaseAjaxItemPicker.java
@@ -140,7 +140,11 @@ public abstract class BaseAjaxItemPicker extends UIInput
       Map requestMap = context.getExternalContext().getRequestParameterMap();
       String fieldId = getHiddenFieldName();
       String value = (String)requestMap.get(fieldId);
-      if (value != null && value.length() != 0)
+      if (value.equals("empty"))
+      {
+         this.setSubmittedValue(new String("empty"));
+      }
+      else if (value != null && value.length() != 0)
       {
          if (getSingleSelect() == true)
          {
diff --git a/source/java/org/alfresco/web/ui/repo/component/UIAjaxTagPicker.java b/source/java/org/alfresco/web/ui/repo/component/UIAjaxTagPicker.java
index 2ddadf7bca..707de045bf 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UIAjaxTagPicker.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UIAjaxTagPicker.java
@@ -112,12 +112,17 @@ public class UIAjaxTagPicker extends BaseAjaxItemPicker
       submitted = (List<NodeRef>)getSubmittedValue();
       if (submitted == null)
       {
-         submitted = (List<NodeRef>)getValue();
-      }
-      // special case to submit empty lists on multi-select values
-      else if (submitted.equals("empty"))
-      {
-         submitted = null;
+         Object objSubmitted = getValue();
+         // special case to submit empty lists on multi-select values
+         if ((objSubmitted != null) && (objSubmitted.toString().equals("empty")))
+         {
+            submitted = null;
+            this.setValue(null);
+         }
+         else
+         {
+            submitted = (List<NodeRef>)getValue();
+         }
       }
 
       if (submitted != null)
diff --git a/source/web/css/picker.css b/source/web/css/picker.css
index 8d4c1ca7b0..52c71c2985 100644
--- a/source/web/css/picker.css
+++ b/source/web/css/picker.css
@@ -97,6 +97,7 @@ div.pickerAjaxWait
 {
    float: left;
    border-bottom: 1px solid #b2b2b2;
+   width: 292px;
 }
 
 .pickerNavControls a img, .pickerNavControls input
@@ -185,8 +186,8 @@ div.pickerNavBreadcrumbPanel
 
 .pickerNavBreadcrumbText
 {
-	float: left;
-	height: 16px;
+   float: left;
+   height: 16px;
    padding: 3px 0px;
 }
 
@@ -224,6 +225,7 @@ div.pickerNavBreadcrumbItem
 
 .pickerAddTagLinkContainer
 {
+   float: left;
    height: 16px;
    margin: 3px 0px;
 }
@@ -231,6 +233,7 @@ div.pickerNavBreadcrumbItem
 .pickerAddTagFormContainer
 {
    display: none;
+   float: left;
 }
 
 .pickerAddTagBox