diff --git a/ccm-cms/src/com/arsdigita/cms/CMSConfig.java b/ccm-cms/src/com/arsdigita/cms/CMSConfig.java
index 2facea487..d35b985e2 100755
--- a/ccm-cms/src/com/arsdigita/cms/CMSConfig.java
+++ b/ccm-cms/src/com/arsdigita/cms/CMSConfig.java
@@ -264,12 +264,18 @@ public final class CMSConfig extends AbstractConfig {
         Parameter.REQUIRED,
         Boolean.FALSE);
     /**
-     * Whether an item's workflow should be deleted, once the item has been (re)published
+     * Whether an item's workflow should be deleted, once the item has been (re)published.
+     * 
+     * jensp 2014-11-07: Default changed from true to false. Deleting the assigned workflow means
+     * that the authors have to reattach a workflow using the Workflow tab, which is complicated 
+     * (for some users too complicated). Also deleting the workflow means that the new  convenient 
+     * link to restart a workflow will not work.
+     * 
      */
     private final Parameter m_deleteWorkflowAfterPublication = new BooleanParameter(
         "com.arsdigita.cms.delete_workflow_after_publication",
         Parameter.REQUIRED,
-        Boolean.TRUE);
+        Boolean.FALSE);
     /**
      * Defines the number of days ahead that are covered in the 'Soon Expired' tab
      */
@@ -400,12 +406,16 @@ public final class CMSConfig extends AbstractConfig {
         Boolean.FALSE);
     /**
      * Allow content creation in Workspace (content center) section listing. Allows you to turn off
-     * the ability to create content in the section listing
+     * the ability to create content in the section listing.
+     * 
+     * jensp 2014-11-07: Default changed to false. This feature isn't used by most users. Also
+     * it has some drawbacks, for example items creating using this way are put into the root 
+     * folder. 
      */
     private final Parameter m_allowContentCreateInSectionListing = new BooleanParameter(
         "com.arsdigita.cms.allow_content_create_in_section_listing",
         Parameter.REQUIRED,
-        Boolean.TRUE);
+        Boolean.FALSE);
     /**
      * Hide the legacy public site link in Workspace (content center) section listing. Legacy public
      * site display is replaced by navigation based presentation (or by portlets) and should be
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactAddForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactAddForm.java
index a59740301..ebe9fa15c 100644
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactAddForm.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactAddForm.java
@@ -92,6 +92,7 @@ public class GenericPersonContactAddForm extends BasicItemForm {
         this.m_itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType.
                                                  findByAssociatedObjectType(
                                                          "com.arsdigita.cms.contenttypes.GenericContact"));
+        this.m_itemSearch.setEditAfterCreate(true);
         add(this.m_itemSearch);
 
         // GenericContact type field
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java
index a4a292b95..948483f55 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java
@@ -349,10 +349,14 @@ public class ItemSearchFolderBrowser extends Table {
                     boolean useURL = "true".equals(state.getValue(new StringParameter(
                         ItemSearchPopup.URL_PARAM)));
 
-                    String fillString = useURL
-                                            ? ItemSearchPopup.getItemURL(
-                            state.getRequest(),
-                            coll.getDomainObject().getOID()) : id + " (" + name + ")";
+                    String fillString;
+                    if (useURL) {
+                        fillString = ItemSearchPopup.getItemURL(state.getRequest(), 
+                                                                coll.getDomainObject().getOID());
+                    } else {
+                        fillString = id.toString();// + " (" + name + ")";
+                    }
+                    
                     String title = ((ContentPage) coll.getDomainObject()).getTitle();
 
                     Label js = new Label(
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchPopup.java b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchPopup.java
index 82e3fcc2d..6aedb75d6 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchPopup.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchPopup.java
@@ -126,9 +126,13 @@ public class ItemSearchPopup extends ItemSearch {
 
             boolean useURL = "true".equals(state.getValue(new StringParameter(URL_PARAM)));
 
-            String fillString = useURL
-                                    ? getItemURL(state.getRequest(), doc.getOID())
-                                    : doc.getOID().get("id").toString();
+            String fillString;
+            if (useURL) {
+                fillString = getItemURL(state.getRequest(), doc.getOID());
+            } else {
+                fillString = doc.getOID().get("id").toString();
+            }
+
             String title = doc.getTitle();
 
             Element jsLabel = Search.newElement("jsAction");