diff --git a/entity/DistrictContact_entity/DistrictContact_entity.aod b/entity/DistrictContact_entity/DistrictContact_entity.aod
index 477c91f73aa325b27167d9f86f9cd836f82fdf67..d72ef1ce9acffbaa9225f744496a40d6b6b922ff 100644
--- a/entity/DistrictContact_entity/DistrictContact_entity.aod
+++ b/entity/DistrictContact_entity/DistrictContact_entity.aod
@@ -27,7 +27,7 @@
     <entityField>
       <name>CONTACT_ID</name>
       <title>Company</title>
-      <consumer>Persons</consumer>
+      <consumer>Organisations</consumer>
       <groupable v="true" />
       <linkedContext>Person</linkedContext>
       <displayValueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
@@ -38,7 +38,6 @@
       <consumer>Districts</consumer>
       <groupable v="true" />
       <linkedContext>District</linkedContext>
-      <displayValueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/district_id/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>ADVISER_CONTACT_ID</name>
@@ -136,25 +135,19 @@
       </children>
     </entityConsumer>
     <entityConsumer>
-      <name>Persons</name>
+      <name>Organisations</name>
       <dependency>
         <name>dependency</name>
         <entityName>Organisation_entity</entityName>
         <fieldName>Organisations</fieldName>
       </dependency>
-      <children>
-        <entityParameter>
-          <name>ExcludedContactIds_param</name>
-          <valueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
     </entityConsumer>
     <entityConsumer>
       <name>Advisers</name>
       <dependency>
         <name>dependency</name>
         <entityName>DistrictResponsible_entity</entityName>
-        <fieldName>DistrictResponsibles</fieldName>
+        <fieldName>DistrictResponsibleAdvisers</fieldName>
       </dependency>
     </entityConsumer>
     <entityConsumer>
@@ -205,7 +198,7 @@
       <recordFieldMappings>
         <dbRecordFieldMapping>
           <name>ADVISER_CONTACT_ID.value</name>
-          <recordfield>DISTRICTCONTACT.CONTACT_ID</recordfield>
+          <recordfield>DISTRICTCONTACT.ADVISER_CONTACT_ID</recordfield>
           <isFilterable v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
diff --git a/entity/DistrictContact_entity/entityfields/contact_id/displayValueProcess.js b/entity/DistrictContact_entity/entityfields/contact_id/displayValueProcess.js
index 8fd798c1755307a0071ca9b34f0353fb8d2a754b..0398a93e921deff9c9cf94e2468bdf1702bffa59 100644
--- a/entity/DistrictContact_entity/entityfields/contact_id/displayValueProcess.js
+++ b/entity/DistrictContact_entity/entityfields/contact_id/displayValueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
 import("system.vars");
 import("Contact_lib");
 
-result.string(ContactUtils.getFullTitleByContactId(vars.get("$field.CONTACT_ID"), false));
\ No newline at end of file
+result.string(ContactUtils.getFullTitleByContactId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/DistrictContact_entity/entityfields/district_id/displayValueProcess.js b/entity/DistrictContact_entity/entityfields/district_id/displayValueProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/DistrictContact_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js b/entity/DistrictContact_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js
deleted file mode 100644
index dea824d504a57be937c69f9dcd9c27520751cf7e..0000000000000000000000000000000000000000
--- a/entity/DistrictContact_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-//import("system.result");
-//import("system.db");
-//import("Sql_lib");
-//
-//result.object(newSelect("CONTACT_ID")
-//                .from("DISTRICTCONTACT")
-//                .where("DISTRICTCONTACT.DISTRICT_ID", "$field.DISTRICT_ID")
-//                .arrayColumn(true));
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
index 747c218d53b18fc7f5e7df5079ad82d649dff4ab..ad1bbffb6bf0fe57bf17b54b8776ce01a0828c88 100644
--- a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
+++ b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
@@ -68,12 +68,6 @@
           <fieldName>DistrictResponsibleUIDs</fieldName>
           <isConsumer v="false" />
         </entityDependency>
-        <entityDependency>
-          <name>7c71a3ee-2b48-4d21-ae66-b53b9a1ff28c</name>
-          <entityName>DistrictContact_entity</entityName>
-          <fieldName>Advisers</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
@@ -243,6 +237,18 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityProvider>
+      <name>DistrictResponsibleAdvisers</name>
+      <lookupIdfield>EMPLOYEE_CONTACT_ID</lookupIdfield>
+      <dependencies>
+        <entityDependency>
+          <name>ac067a2d-e313-44b7-b219-f834ef4a7629</name>
+          <entityName>DistrictContact_entity</entityName>
+          <fieldName>Advisers</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 472f0c52c52e9e84b006a14620028814b30c4e79..a42f2bfc79e128e3f064103bf03856e122c7e8fe 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -154,7 +154,7 @@
         <entityDependency>
           <name>b64b29e6-59c5-4250-9bc7-b08c85976e7e</name>
           <entityName>DistrictContact_entity</entityName>
-          <fieldName>Persons</fieldName>
+          <fieldName>Organisations</fieldName>
           <isConsumer v="false" />
         </entityDependency>
       </dependencies>
diff --git a/neonView/DistrictContactFilter_view/DistrictContactFilter_view.aod b/neonView/DistrictContactFilter_view/DistrictContactFilter_view.aod
index 681c4fb4db196aa39f7f2d7b6706f8935023a3a3..fe94c7158652cc235602300a5f84385b0178dd09 100644
--- a/neonView/DistrictContactFilter_view/DistrictContactFilter_view.aod
+++ b/neonView/DistrictContactFilter_view/DistrictContactFilter_view.aod
@@ -12,6 +12,8 @@
     <tableViewTemplate>
       <name>districtContacts</name>
       <entityField>#ENTITY</entityField>
+      <linkedColumns />
+      <fixedFilterFields />
       <columns>
         <neonTableColumn>
           <name>b9295685-3242-4e15-af62-72f4adb758a3</name>
diff --git a/neonView/PrivatePersonPreview_view/PrivatePersonPreview_view.aod b/neonView/PrivatePersonPreview_view/PrivatePersonPreview_view.aod
index 13f2b9fd014f79514b2417b247f8e079b5cee39a..a294c41097baa5d4e039bd7d34f75cceaf6ee6db 100644
--- a/neonView/PrivatePersonPreview_view/PrivatePersonPreview_view.aod
+++ b/neonView/PrivatePersonPreview_view/PrivatePersonPreview_view.aod
@@ -10,7 +10,7 @@
   <children>
     <neonViewReference>
       <name>0a66aea5-bf81-47e4-941d-9158ff8f4f51</name>
-      <entityField>Persons</entityField>
+      <entityField>Organisations</entityField>
       <view>ContactTitledList_view</view>
     </neonViewReference>
   </children>