diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 830a6fff9eb6ede8219e2d2560cdd94528c57540..640885dfe60e703d37aea2de2fb1386edf10985e 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -34,6 +34,7 @@
       <tableName>ADDRESS</tableName>
       <columnName>ADDR_TYPE</columnName>
       <caption>Adresstyp</caption>
+      <possibleItemsProcess>%aditoprj%/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js</possibleItemsProcess>
     </entityField>
     <entityField>
       <name>BUILDINGNO</name>
diff --git a/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js b/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bd3b71c3f5182843e31128aa3bfd74c236464c5b
--- /dev/null
+++ b/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.translate");
+
+var types = [
+     ["0", translate.text("Hauptadresse")]
+    ,["1", translate.text("Lieferadresse")]
+    ,["2", translate.text("Privatadresse")]
+];
+
+result.object(types);
\ No newline at end of file
diff --git a/entity/Comm_entity/Comm_entity.aod b/entity/Comm_entity/Comm_entity.aod
index 38b92f9e1dca19856872f8cc39086f58d3455e70..6b23d2ef4f63d84f22bee85d0dc2190368622324 100644
--- a/entity/Comm_entity/Comm_entity.aod
+++ b/entity/Comm_entity/Comm_entity.aod
@@ -36,6 +36,7 @@
       <tableName>COMM</tableName>
       <columnName>MEDIUM_ID</columnName>
       <caption>Medium</caption>
+      <possibleItemsProcess>%aditoprj%/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js</possibleItemsProcess>
     </entityField>
     <entityField>
       <name>RELATION_ID</name>
diff --git a/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js b/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..edb7115774f16ef02c23d8c244fc2943207579e7
--- /dev/null
+++ b/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.translate");
+
+var types = [
+     ["0", translate.text("Email")]
+    ,["1", translate.text("Telefon")]
+    ,["2", translate.text("Internet")]
+    ,["3", translate.text("Handy")]    
+];
+
+result.object(types);
\ No newline at end of file
diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod
index bfe5fdd3eae9ec14f8d138cd61de60ecb7afb319..2f422064040971961c3e7753c22129549a11eb87 100644
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Org_entity/Org_entity.aod
@@ -44,7 +44,7 @@
       <tableName>ORG</tableName>
       <columnName>INFO</columnName>
       <caption>Information</caption>
-      <contentType>HTML</contentType>
+      <contentType>TEXT</contentType>
     </entityField>
     <entityField>
       <name>NAME</name>
@@ -93,6 +93,7 @@
       <columnName>LANGUAGE</columnName>
       <caption>Language</caption>
       <possibleItemsProcess>%aditoprj%/entity/Org_entity/entityfields/language/possibleItemsProcess.js</possibleItemsProcess>
+      <selectionMode>SINGLE</selectionMode>
     </entityField>
     <entityField>
       <name>ORG_ID</name>
diff --git a/neonView/OrgMain_view/OrgMain_view.aod b/neonView/OrgMain_view/OrgMain_view.aod
index 402507e167087d8fedc232c6c56f5572b53a1819..edb4bb4693ef97734f73efa8ada4fe2fc86b9acc 100644
--- a/neonView/OrgMain_view/OrgMain_view.aod
+++ b/neonView/OrgMain_view/OrgMain_view.aod
@@ -25,10 +25,5 @@
       <entityField>PersOrg_dfo</entityField>
       <view>PersFilter_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>cce1d1ef-cc69-455a-a2a6-3357c80bb235</name>
-      <entityField>OrgAddress_dfo</entityField>
-      <view>AddressFilter_view</view>
-    </neonViewReference>
   </children>
 </neonView>