diff --git a/BeWo/View/Detail/CustomerView.xaml b/BeWo/View/Detail/CustomerView.xaml
index 7aa43a78e..abb50de8b 100644
--- a/BeWo/View/Detail/CustomerView.xaml
+++ b/BeWo/View/Detail/CustomerView.xaml
@@ -252,11 +252,15 @@
             </dxg:GridColumn.CellTemplate>
           </dxg:GridColumn>
           <dxg:GridColumn FieldName="PersonString" Header="Person" Width="150" AllowEditing="False" />
-          <dxg:GridColumn FieldName="Organisation" Header="Organisation" Width="150" AllowEditing="False" />
+          <dxg:GridColumn FieldName="OrganisationString" Header="Organisation" Width="150" AllowEditing="False" />
           <dxg:GridColumn x:Name="gridcolumn_evironmentroleperson" FieldName="Role" Header="Rolle" Width="150" />
           <dxg:GridColumn FieldName="AddressSummaryInfo" Header="Adresse" Width="150" />
           <dxg:GridColumn FieldName="ContactSummaryInfo" Header="Kontaktdaten" Width="150" />
-          <dxg:GridColumn FieldName="Notice" Header="Notiz" Width="250" />
+          <dxg:GridColumn FieldName="Notice" Header="Notiz" Width="250" >
+              <dxg:GridColumn.EditSettings>
+                <dxe:TextEditSettings TextWrapping="Wrap" AcceptsReturn="True"/>
+            </dxg:GridColumn.EditSettings>
+          </dxg:GridColumn>            
         </dxg:GridControl.Columns>
         <dxg:GridControl.View>
           <dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" RowDoubleClick="TableView_OnRowDoubleClick" />
@@ -276,7 +280,11 @@
           <dxg:GridColumn FieldName="PersonString" Header="Person" Width="150" AllowEditing="False" />          
           <dxg:GridColumn FieldName="AddressSummaryInfo" Header="Adresse" Width="150" />
           <dxg:GridColumn FieldName="ContactSummaryInfo" Header="Kontaktdaten" Width="150" />
-          <dxg:GridColumn FieldName="Notice" Header="Notiz" Width="250" />
+          <dxg:GridColumn FieldName="Notice" Header="Notiz" Width="250">
+            <dxg:GridColumn.EditSettings>
+                <dxe:TextEditSettings TextWrapping="Wrap" AcceptsReturn="True"/>
+            </dxg:GridColumn.EditSettings>
+          </dxg:GridColumn>   
           <dxg:GridColumn  x:Name="gridcolumn_evironmentFamilyStatus" FieldName="Role" Header="Familienstatus" Width="150" />
         </dxg:GridControl.Columns>
         <dxg:GridControl.View>
@@ -296,12 +304,16 @@
             </dxg:GridColumn.CellTemplate>
           </dxg:GridColumn>
           <dxg:GridColumn FieldName="OrganisationString" Header="Organisation" Width="150" AllowEditing="False" />
-          <dxg:GridColumn FieldName="Person" Header="Ansprechpartner" Width="150" AllowEditing="False" />
+          <dxg:GridColumn FieldName="PersonString" Header="Ansprechpartner" Width="150" AllowEditing="False" />
           <dxg:GridColumn x:Name="gridcolumn_evironmentroleorganisation" FieldName="Role" Header="Rolle" Width="150" />
           <dxg:GridColumn FieldName="AddressSummaryInfo" Header="Adresse" Width="150" />
           <dxg:GridColumn FieldName="ContactSummaryInfo" Header="Kontaktdaten" Width="150" />
           <dxg:GridColumn FieldName="Info1" Header="Info" Width="200" />
-          <dxg:GridColumn FieldName="Notice" Header="Notiz" Width="250" />
+          <dxg:GridColumn FieldName="Notice" Header="Notiz" Width="250" >
+            <dxg:GridColumn.EditSettings>
+                <dxe:TextEditSettings TextWrapping="Wrap" AcceptsReturn="True"/>
+            </dxg:GridColumn.EditSettings>
+          </dxg:GridColumn>
         </dxg:GridControl.Columns>
         <dxg:GridControl.View>
           <dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" RowDoubleClick="TableView_OnRowDoubleClick" />
diff --git a/Shared/DataContracts/ClientPartials/ValueListEntryDC.cs b/Shared/DataContracts/ClientPartials/ValueListEntryDC.cs
index 2563f6fb0..03f221219 100644
--- a/Shared/DataContracts/ClientPartials/ValueListEntryDC.cs
+++ b/Shared/DataContracts/ClientPartials/ValueListEntryDC.cs
@@ -1,8 +1,10 @@
 //using BeWo.Core.Service;
 
+using System;
+
 namespace BS.Shared.DataContracts
 {
-    public partial class ValueListEntryDC
+    public partial class ValueListEntryDC : IComparable
     {
         // private ValueListEntryDC _ParentEntry;
 
@@ -50,5 +52,16 @@ namespace BS.Shared.DataContracts
         {
             return this.TypeDescription;
         }
+
+        public int CompareTo(object obj)
+        {
+
+            var ve2 = obj as ValueListEntryDC;
+            if (ve2 == null || String.IsNullOrEmpty(ve2.TypeDescription))
+                return -1;
+            if (String.IsNullOrEmpty(TypeDescription))
+                return 1;
+            return TypeDescription.CompareTo(ve2.TypeDescription);
+        }
     }
 }
\ No newline at end of file