diff --git a/src/entities/view/viewDirector.ts b/src/entities/view/viewDirector.ts
index 63e51196..87398e51 100644
--- a/src/entities/view/viewDirector.ts
+++ b/src/entities/view/viewDirector.ts
@@ -2,38 +2,47 @@ import { ViewColumn, ViewEntity } from "typeorm";
 
 @ViewEntity({
   expression: `SELECT 
-        \`bma_ehr_organization_demo\`.\`profile\`.\`id\` AS \`Id\`,
-        \`bma_ehr_organization_demo\`.\`profile\`.\`prefix\` AS \`prefix\`,
-        \`bma_ehr_organization_demo\`.\`profile\`.\`firstName\` AS \`firstName\`,
-        \`bma_ehr_organization_demo\`.\`profile\`.\`lastName\` AS \`lastName\`,
-        \`bma_ehr_organization_demo\`.\`profile\`.\`citizenId\` AS \`citizenId\`,
-        \`bma_ehr_organization_demo\`.\`profile\`.\`position\` AS \`position\`,
+        \`profile\`.\`id\` AS \`Id\`,
+        \`profile\`.\`prefix\` AS \`prefix\`,
+        \`profile\`.\`firstName\` AS \`firstName\`,
+        \`profile\`.\`lastName\` AS \`lastName\`,
+        \`profile\`.\`citizenId\` AS \`citizenId\`,
+        \`profile\`.\`position\` AS \`position\`,
         CONCAT((CASE
-                    WHEN (\`bma_ehr_organization_demo\`.\`posMaster\`.\`orgChild1Id\` IS NULL) THEN \`bma_ehr_organization_demo\`.\`orgRoot\`.\`orgRootShortName\`
-                    WHEN (\`bma_ehr_organization_demo\`.\`posMaster\`.\`orgChild2Id\` IS NULL) THEN \`bma_ehr_organization_demo\`.\`orgChild1\`.\`orgChild1ShortName\`
-                    WHEN (\`bma_ehr_organization_demo\`.\`posMaster\`.\`orgChild3Id\` IS NULL) THEN \`bma_ehr_organization_demo\`.\`orgChild2\`.\`orgChild2ShortName\`
-                    WHEN (\`bma_ehr_organization_demo\`.\`posMaster\`.\`orgChild4Id\` IS NULL) THEN \`bma_ehr_organization_demo\`.\`orgChild3\`.\`orgChild3ShortName\`
-                    ELSE \`bma_ehr_organization_demo\`.\`orgChild4\`.\`orgChild4ShortName\`
+                    WHEN (\`posMaster\`.\`orgChild1Id\` IS NULL) THEN \`orgRoot\`.\`orgRootShortName\`
+                    WHEN (\`posMaster\`.\`orgChild2Id\` IS NULL) THEN \`orgChild1\`.\`orgChild1ShortName\`
+                    WHEN (\`posMaster\`.\`orgChild3Id\` IS NULL) THEN \`orgChild2\`.\`orgChild2ShortName\`
+                    WHEN (\`posMaster\`.\`orgChild4Id\` IS NULL) THEN \`orgChild3\`.\`orgChild3ShortName\`
+                    ELSE \`orgChild4\`.\`orgChild4ShortName\`
                 END),
-                \`bma_ehr_organization_demo\`.\`posMaster\`.\`posMasterNo\`) AS \`posNo\`,
-        \`bma_ehr_organization_demo\`.\`posMaster\`.\`isDirector\` AS \`isDirector\`,
-        \`bma_ehr_organization_demo\`.\`posLevel\`.\`posLevelName\` AS \`posLevel\`,
-        \`bma_ehr_organization_demo\`.\`posType\`.\`posTypeName\` AS \`posType\`,
-        \`bma_ehr_organization_demo\`.\`posMaster\`.\`orgRootId\` AS \`orgRootId\`,
-        CONCAT(\`bma_ehr_organization_demo\`.\`posMaster\`.\`id\`,
-                \`bma_ehr_organization_demo\`.\`profile\`.\`id\`) AS \`key\`,
+                \`posMaster\`.\`posMasterNo\`) AS \`posNo\`,
+        \`posMaster\`.\`isDirector\` AS \`isDirector\`,
+        \`posLevel\`.\`posLevelName\` AS \`posLevel\`,
+        \`posType\`.\`posTypeName\` AS \`posType\`,
+        \`posExecutive\`.\`posExecutiveName\` AS \`posExecutiveName\`,
+        \`orgRoot\`.\`isDeputy\` AS \`isDeputy\`,
+        \`posMaster\`.\`orgRootId\` AS \`orgRootId\`,
+        \`posMaster\`.\`orgChild1Id\` AS \`orgChild1Id\`,
+        \`posMaster\`.\`orgChild2Id\` AS \`orgChild2Id\`,
+        \`posMaster\`.\`orgChild3Id\` AS \`orgChild3Id\`,
+        \`posMaster\`.\`orgChild4Id\` AS \`orgChild4Id\`,
+        CONCAT(\`posMaster\`.\`id\`, \`profile\`.\`id\`) AS \`key\`,
         NULL AS \`actFullNameId\`,
         NULL AS \`actFullName\`
     FROM
-        ((((((((\`bma_ehr_organization_demo\`.\`posMaster\`
-        JOIN \`bma_ehr_organization_demo\`.\`profile\` ON ((\`bma_ehr_organization_demo\`.\`posMaster\`.\`current_holderId\` = \`bma_ehr_organization_demo\`.\`profile\`.\`id\`)))
-        LEFT JOIN \`bma_ehr_organization_demo\`.\`orgRoot\` ON ((\`bma_ehr_organization_demo\`.\`posMaster\`.\`orgRootId\` = \`bma_ehr_organization_demo\`.\`orgRoot\`.\`id\`)))
-        LEFT JOIN \`bma_ehr_organization_demo\`.\`orgChild1\` ON ((\`bma_ehr_organization_demo\`.\`posMaster\`.\`orgChild1Id\` = \`bma_ehr_organization_demo\`.\`orgChild1\`.\`id\`)))
-        LEFT JOIN \`bma_ehr_organization_demo\`.\`orgChild2\` ON ((\`bma_ehr_organization_demo\`.\`posMaster\`.\`orgChild2Id\` = \`bma_ehr_organization_demo\`.\`orgChild2\`.\`id\`)))
-        LEFT JOIN \`bma_ehr_organization_demo\`.\`orgChild3\` ON ((\`bma_ehr_organization_demo\`.\`posMaster\`.\`orgChild3Id\` = \`bma_ehr_organization_demo\`.\`orgChild3\`.\`id\`)))
-        LEFT JOIN \`bma_ehr_organization_demo\`.\`orgChild4\` ON ((\`bma_ehr_organization_demo\`.\`posMaster\`.\`orgChild4Id\` = \`bma_ehr_organization_demo\`.\`orgChild4\`.\`id\`)))
-        JOIN \`bma_ehr_organization_demo\`.\`posLevel\` ON ((\`bma_ehr_organization_demo\`.\`profile\`.\`posLevelId\` = \`bma_ehr_organization_demo\`.\`posLevel\`.\`id\`)))
-        JOIN \`bma_ehr_organization_demo\`.\`posType\` ON ((\`bma_ehr_organization_demo\`.\`profile\`.\`posTypeId\` = \`bma_ehr_organization_demo\`.\`posType\`.\`id\`)))`,
+        ((((((((((\`posMaster\`
+        JOIN \`profile\` ON ((\`posMaster\`.\`current_holderId\` = \`profile\`.\`id\`)))
+        LEFT JOIN \`orgRoot\` ON ((\`posMaster\`.\`orgRootId\` = \`orgRoot\`.\`id\`)))
+        LEFT JOIN \`orgChild1\` ON ((\`posMaster\`.\`orgChild1Id\` = \`orgChild1\`.\`id\`)))
+        LEFT JOIN \`orgChild2\` ON ((\`posMaster\`.\`orgChild2Id\` = \`orgChild2\`.\`id\`)))
+        LEFT JOIN \`orgChild3\` ON ((\`posMaster\`.\`orgChild3Id\` = \`orgChild3\`.\`id\`)))
+        LEFT JOIN \`orgChild4\` ON ((\`posMaster\`.\`orgChild4Id\` = \`orgChild4\`.\`id\`)))
+        JOIN \`posLevel\` ON ((\`profile\`.\`posLevelId\` = \`posLevel\`.\`id\`)))
+        JOIN \`posType\` ON ((\`profile\`.\`posTypeId\` = \`posType\`.\`id\`)))
+        LEFT JOIN \`position\` ON ((\`posMaster\`.\`id\` = \`position\`.\`posMasterId\`)))
+        LEFT JOIN \`posExecutive\` ON ((\`position\`.\`posExecutiveId\` = \`posExecutive\`.\`id\`)))
+    WHERE
+        (\`position\`.\`positionIsSelected\` = TRUE)`,
 })
 export class viewDirector {
   @ViewColumn()
diff --git a/src/entities/view/viewDirectorActing.ts b/src/entities/view/viewDirectorActing.ts
index 6a6f6797..ea87f577 100644
--- a/src/entities/view/viewDirectorActing.ts
+++ b/src/entities/view/viewDirectorActing.ts
@@ -9,38 +9,48 @@ import { ViewColumn, ViewEntity } from "typeorm";
         \`profileChild\`.\`citizenId\` AS \`citizenId\`,
         \`profileChild\`.\`position\` AS \`position\`,
         CONCAT((CASE
-                    WHEN (\`bma_ehr_organization_demo\`.\`posMaster\`.\`orgChild1Id\` IS NULL) THEN \`orgRootChild\`.\`orgRootShortName\`
-                    WHEN (\`bma_ehr_organization_demo\`.\`posMaster\`.\`orgChild2Id\` IS NULL) THEN \`orgChild1Child\`.\`orgChild1ShortName\`
-                    WHEN (\`bma_ehr_organization_demo\`.\`posMaster\`.\`orgChild3Id\` IS NULL) THEN \`orgChild2Child\`.\`orgChild2ShortName\`
-                    WHEN (\`bma_ehr_organization_demo\`.\`posMaster\`.\`orgChild4Id\` IS NULL) THEN \`orgChild3Child\`.\`orgChild3ShortName\`
+                    WHEN (\`posMaster\`.\`orgChild1Id\` IS NULL) THEN \`orgRootChild\`.\`orgRootShortName\`
+                    WHEN (\`posMaster\`.\`orgChild2Id\` IS NULL) THEN \`orgChild1Child\`.\`orgChild1ShortName\`
+                    WHEN (\`posMaster\`.\`orgChild3Id\` IS NULL) THEN \`orgChild2Child\`.\`orgChild2ShortName\`
+                    WHEN (\`posMaster\`.\`orgChild4Id\` IS NULL) THEN \`orgChild3Child\`.\`orgChild3ShortName\`
                     ELSE \`orgChild4Child\`.\`orgChild4ShortName\`
                 END),
-                \`bma_ehr_organization_demo\`.\`posMaster\`.\`posMasterNo\`) AS \`posNo\`,
+                \`posMaster\`.\`posMasterNo\`) AS \`posNo\`,
         \`posMasterChild\`.\`isDirector\` AS \`isDirectorChild\`,
         \`posMaster\`.\`isDirector\` AS \`isDirector\`,
-        \`bma_ehr_organization_demo\`.\`posLevel\`.\`posLevelName\` AS \`posLevel\`,
-        \`bma_ehr_organization_demo\`.\`posType\`.\`posTypeName\` AS \`posType\`,
-        \`bma_ehr_organization_demo\`.\`posMaster\`.\`orgRootId\` AS \`orgRootId\`,
-        CONCAT(\`posMaster\`.\`id\`,
-                \`profileChild\`.\`id\`) AS \`key\`,
-        \`bma_ehr_organization_demo\`.\`profile\`.\`id\` AS \`actFullNameId\`,
-        CONCAT(\`bma_ehr_organization_demo\`.\`profile\`.\`prefix\`,
-                \`bma_ehr_organization_demo\`.\`profile\`.\`firstName\`,
+        \`posLevel\`.\`posLevelName\` AS \`posLevel\`,
+        \`posType\`.\`posTypeName\` AS \`posType\`,
+        \`posExecutive\`.\`posExecutiveName\` AS \`posExecutiveName\`,
+        \`orgRoot\`.\`isDeputy\` AS \`isDeputy\`,
+        \`posMaster\`.\`orgRootId\` AS \`orgRootId\`,
+        \`posMaster\`.\`orgChild1Id\` AS \`orgChild1Id\`,
+        \`posMaster\`.\`orgChild2Id\` AS \`orgChild2Id\`,
+        \`posMaster\`.\`orgChild3Id\` AS \`orgChild3Id\`,
+        \`posMaster\`.\`orgChild4Id\` AS \`orgChild4Id\`,
+        CONCAT(\`posMaster\`.\`id\`, \`profileChild\`.\`id\`) AS \`key\`,
+        \`profile\`.\`id\` AS \`actFullNameId\`,
+        CONCAT(\`profile\`.\`prefix\`,
+                \`profile\`.\`firstName\`,
                 ' ',
-                \`bma_ehr_organization_demo\`.\`profile\`.\`lastName\`) AS \`actFullName\`
+                \`profile\`.\`lastName\`) AS \`actFullName\`
     FROM
-        (((((((((((\`bma_ehr_organization_demo\`.\`posMasterAct\`
-        JOIN \`bma_ehr_organization_demo\`.\`posMaster\` \`posMasterChild\` ON ((\`bma_ehr_organization_demo\`.\`posMasterAct\`.\`posMasterChildId\` = \`posMasterChild\`.\`id\`)))
-        JOIN \`bma_ehr_organization_demo\`.\`profile\` \`profileChild\` ON ((\`posMasterChild\`.\`current_holderId\` = \`profileChild\`.\`id\`)))
-        LEFT JOIN \`bma_ehr_organization_demo\`.\`orgRoot\` \`orgRootChild\` ON ((\`posMasterChild\`.\`orgRootId\` = \`orgRootChild\`.\`id\`)))
-        LEFT JOIN \`bma_ehr_organization_demo\`.\`orgChild1\` \`orgChild1Child\` ON ((\`posMasterChild\`.\`orgChild1Id\` = \`orgChild1Child\`.\`id\`)))
-        LEFT JOIN \`bma_ehr_organization_demo\`.\`orgChild2\` \`orgChild2Child\` ON ((\`posMasterChild\`.\`orgChild2Id\` = \`orgChild2Child\`.\`id\`)))
-        LEFT JOIN \`bma_ehr_organization_demo\`.\`orgChild3\` \`orgChild3Child\` ON ((\`posMasterChild\`.\`orgChild3Id\` = \`orgChild3Child\`.\`id\`)))
-        LEFT JOIN \`bma_ehr_organization_demo\`.\`orgChild4\` \`orgChild4Child\` ON ((\`posMasterChild\`.\`orgChild4Id\` = \`orgChild4Child\`.\`id\`)))
-        JOIN \`bma_ehr_organization_demo\`.\`posLevel\` ON ((\`profileChild\`.\`posLevelId\` = \`bma_ehr_organization_demo\`.\`posLevel\`.\`id\`)))
-        JOIN \`bma_ehr_organization_demo\`.\`posType\` ON ((\`profileChild\`.\`posTypeId\` = \`bma_ehr_organization_demo\`.\`posType\`.\`id\`)))
-        JOIN \`bma_ehr_organization_demo\`.\`posMaster\` ON ((\`bma_ehr_organization_demo\`.\`posMasterAct\`.\`posMasterId\` = \`bma_ehr_organization_demo\`.\`posMaster\`.\`id\`)))
-        JOIN \`bma_ehr_organization_demo\`.\`profile\` ON ((\`bma_ehr_organization_demo\`.\`posMaster\`.\`current_holderId\` = \`bma_ehr_organization_demo\`.\`profile\`.\`id\`)))`,
+        ((((((((((((((\`posMasterAct\`
+        JOIN \`posMaster\` \`posMasterChild\` ON ((\`posMasterAct\`.\`posMasterChildId\` = \`posMasterChild\`.\`id\`)))
+        JOIN \`profile\` \`profileChild\` ON ((\`posMasterChild\`.\`current_holderId\` = \`profileChild\`.\`id\`)))
+        LEFT JOIN \`orgRoot\` \`orgRootChild\` ON ((\`posMasterChild\`.\`orgRootId\` = \`orgRootChild\`.\`id\`)))
+        LEFT JOIN \`orgChild1\` \`orgChild1Child\` ON ((\`posMasterChild\`.\`orgChild1Id\` = \`orgChild1Child\`.\`id\`)))
+        LEFT JOIN \`orgChild2\` \`orgChild2Child\` ON ((\`posMasterChild\`.\`orgChild2Id\` = \`orgChild2Child\`.\`id\`)))
+        LEFT JOIN \`orgChild3\` \`orgChild3Child\` ON ((\`posMasterChild\`.\`orgChild3Id\` = \`orgChild3Child\`.\`id\`)))
+        LEFT JOIN \`orgChild4\` \`orgChild4Child\` ON ((\`posMasterChild\`.\`orgChild4Id\` = \`orgChild4Child\`.\`id\`)))
+        JOIN \`posLevel\` ON ((\`profileChild\`.\`posLevelId\` = \`posLevel\`.\`id\`)))
+        JOIN \`posType\` ON ((\`profileChild\`.\`posTypeId\` = \`posType\`.\`id\`)))
+        JOIN \`posMaster\` ON ((\`posMasterAct\`.\`posMasterId\` = \`posMaster\`.\`id\`)))
+        LEFT JOIN \`orgRoot\` ON ((\`posMaster\`.\`orgRootId\` = \`orgRoot\`.\`id\`)))
+        JOIN \`profile\` ON ((\`posMaster\`.\`current_holderId\` = \`profile\`.\`id\`)))
+        LEFT JOIN \`position\` ON ((\`posMasterChild\`.\`id\` = \`position\`.\`posMasterId\`)))
+        LEFT JOIN \`posExecutive\` ON ((\`position\`.\`posExecutiveId\` = \`posExecutive\`.\`id\`)))
+    WHERE
+        (\`position\`.\`positionIsSelected\` = TRUE)`,
 })
 export class viewDirectorActing {
   @ViewColumn()