diff --git a/neonContext/Default_context/Default_context.aod b/neonContext/Default_context/Default_context.aod
new file mode 100644
index 0000000000000000000000000000000000000000..d7dc65e69616f3c8fb6cb29d9c3b3499cffe9fe2
--- /dev/null
+++ b/neonContext/Default_context/Default_context.aod
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
+  <name>Default_context</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <references>
+    <neonViewReference>
+      <name>9fab8655-e49d-4108-a64f-a371c3d9c80b</name>
+      <view>DefaultLookup_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/Org_context/Org_context.aod b/neonContext/Org_context/Org_context.aod
index 388b6446c3b02f5ddfd7f0726af591ea0854193c..c9a5b204f3b4e4a97f86b3e8ae7509fd265c4ca3 100644
--- a/neonContext/Org_context/Org_context.aod
+++ b/neonContext/Org_context/Org_context.aod
@@ -9,7 +9,6 @@
   <filterview>OrgFilter_view</filterview>
   <editview>OrgEdit_view</editview>
   <preview>OrgPreview_view</preview>
-  <lookupview>OrgFilter_view</lookupview>
   <entity>Org_entity</entity>
   <references>
     <neonViewReference>
diff --git a/neonView/DefaultLookup_view/DefaultLookup_view.aod b/neonView/DefaultLookup_view/DefaultLookup_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..d824139d580225a2da56d1a1d505215052b92e48
--- /dev/null
+++ b/neonView/DefaultLookup_view/DefaultLookup_view.aod
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
+  <name>DefaultLookup_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <listTemplate>
+      <name>ListTemplate</name>
+      <entityField>#ENTITY</entityField>
+    </listTemplate>
+  </children>
+</neonView>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 6342decac506717ea22a8355652f8a4fde3f4c99..b0f2142f63120b471b54bfc6315e1e9844692dc3 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -2,7 +2,7 @@
 <preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.0.1">
   <name>_____PREFERENCES_PROJECT</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <projectName>xRM-Basic</projectName>
+  <projectName>xRM-Basic-5</projectName>
   <jditoMaxContentSize v="57671680" />
   <calendarCategoriesEvent>
     <entry>