diff --git a/neonView/OrgBasic_view/OrgBasic_view.aod b/neonView/OrgBasic_view/OrgBasic_view.aod
index 991f27b2f13f9e0487b6da1e2d157b0ba51b6203..243d09f9f8859360b03265280808f68631c88a46 100644
--- a/neonView/OrgBasic_view/OrgBasic_view.aod
+++ b/neonView/OrgBasic_view/OrgBasic_view.aod
@@ -14,19 +14,19 @@
       <descriptionField>CUSTOMERCODE</descriptionField>
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
-    <titledListViewTemplate>
-      <name>DetailedData_template</name>
+    <genericViewTemplate>
+      <name>DetailData_template</name>
       <entityField>#ENTITY</entityField>
-      <columns>
-        <neonTableColumn>
-          <name>bd288524-b70b-4cf3-bd31-2aa8fdfca2f7</name>
-          <entityField>LANGUAGE</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>8e8b125d-410d-4ce0-a383-11aa507d8c04</name>
+      <fields>
+        <entityFieldLink>
+          <name>5a696624-b44d-441a-b080-ef9da18db731</name>
           <entityField>STATUS</entityField>
-        </neonTableColumn>
-      </columns>
-    </titledListViewTemplate>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>e5568187-6e89-4eac-bb08-9c9dbad6f791</name>
+          <entityField>LANGUAGE</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
   </children>
 </neonView>
diff --git a/neonView/OrgDetailed_view/OrgDetailed_view.aod b/neonView/OrgDetailed_view/OrgDetailed_view.aod
index b7d58cb02b00a577dd93eb94c153c296d7618f5b..35415555519a59d95457423dc4d768fe8ffab5ce 100644
--- a/neonView/OrgDetailed_view/OrgDetailed_view.aod
+++ b/neonView/OrgDetailed_view/OrgDetailed_view.aod
@@ -15,27 +15,35 @@
       <entityField>#ENTITY</entityField>
       <view>OrgBasic_view</view>
     </neonViewReference>
-    <tableViewTemplate>
+    <genericViewTemplate>
       <name>OrgDetail_template</name>
       <entityField>#ENTITY</entityField>
-      <columns>
-        <neonTableColumn>
-          <name>5515d98b-1b2b-411e-bc0e-962c1baeec4b</name>
-          <entityField>TYPE</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>cbdc051a-fca7-4821-af2e-ca91f944864e</name>
+      <fields>
+        <entityFieldLink>
+          <name>4a1cadde-5bbf-4445-b3c0-b147753e699a</name>
+          <entityField>CUSTOMERCODE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>74734ac3-7e79-4ab9-a783-e275fdce5641</name>
+          <entityField>INFO</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>8a5608fc-39c3-4592-8760-83a127744e0b</name>
           <entityField>LANGUAGE</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>3dc98a9b-0d10-41d1-92ad-7dfdb2774abc</name>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>fff87b33-304e-466b-a7ce-bc574a4e4544</name>
+          <entityField>NAME</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>359dc5ae-388b-4788-a069-450c7c5b3c51</name>
           <entityField>STATUS</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>6c0e2cba-708c-4a99-b328-7102fa213b97</name>
-          <entityField>INFO</entityField>
-        </neonTableColumn>
-      </columns>
-    </tableViewTemplate>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>01fd8214-96d7-4b4e-82aa-8ab45c5ace47</name>
+          <entityField>TYPE</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
   </children>
 </neonView>