diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts
index eefcf20a..27315e6a 100644
--- a/src/controllers/OrganizationController.ts
+++ b/src/controllers/OrganizationController.ts
@@ -5373,11 +5373,11 @@ export class OrganizationController extends Controller {
           posMaster: await Promise.all(
             orgRoot.posMasters
               .filter(
-                (x) => x.orgChild1Id == null && x.current_holderId != null && x.posMasterOrder <= 3,
+                (x) => x.orgChild1Id == null && x.current_holderId != null && x.posMasterOrder <= 3 && x.isDirector === true,
               )
               .map(async (x) => ({
                 posmasterId: x.id,
-                posNo: x.isDirector == true ? orgRoot.orgRootShortName + x.posMasterNo: null,
+                posNo: orgRoot.orgRootShortName + x.posMasterNo,
                 orgTreeId: orgRoot.id,
                 orgLevel: 0,
                 fullNameCurrentHolder:
@@ -5412,11 +5412,12 @@ export class OrganizationController extends Controller {
                       (x) =>
                         x.orgChild2Id == null &&
                         x.current_holderId != null &&
-                        x.posMasterOrder <= 3,
+                        x.posMasterOrder <= 3 &&
+                        x.isDirector === true
                     )
                     .map(async (x) => ({
                       posmasterId: x.id,
-                      posNo: x.isDirector == true ? orgChild1.orgChild1ShortName + x.posMasterNo: null,
+                      posNo: orgChild1.orgChild1ShortName + x.posMasterNo,
                       orgTreeId: orgChild1.id,
                       orgLevel: 1,
                       fullNameCurrentHolder:
@@ -5452,11 +5453,12 @@ export class OrganizationController extends Controller {
                             (x) =>
                               x.orgChild3Id == null &&
                               x.current_holderId != null &&
-                              x.posMasterOrder <= 3,
+                              x.posMasterOrder <= 3 && 
+                              x.isDirector === true,
                           )
                           .map(async (x) => ({
                             posmasterId: x.id,
-                            posNo: x.isDirector == true ? orgChild2.orgChild2ShortName + x.posMasterNo: null,
+                            posNo: orgChild2.orgChild2ShortName + x.posMasterNo,
                             orgTreeId: orgChild2.id,
                             orgLevel: 2,
                             fullNameCurrentHolder:
@@ -5492,11 +5494,12 @@ export class OrganizationController extends Controller {
                                   (x) =>
                                     x.orgChild4Id == null &&
                                     x.current_holderId != null &&
-                                    x.posMasterOrder <= 3,
+                                    x.posMasterOrder <= 3 && 
+                                    x.isDirector === true,
                                 )
                                 .map(async (x) => ({
                                   posmasterId: x.id,
-                                  posNo: x.isDirector == true ? orgChild3.orgChild3ShortName + x.posMasterNo: null,
+                                  posNo: orgChild3.orgChild3ShortName + x.posMasterNo,
                                   orgTreeId: orgChild3.id,
                                   orgLevel: 3,
                                   fullNameCurrentHolder:
@@ -5529,11 +5532,11 @@ export class OrganizationController extends Controller {
                                   posMaster: await Promise.all(
                                     orgChild4.posMasters
                                       .filter(
-                                        (x) => x.current_holderId != null && x.posMasterOrder <= 3,
+                                        (x) => x.current_holderId != null && x.posMasterOrder <= 3 && x.isDirector === true,
                                       )
                                       .map(async (x) => ({
                                         posmasterId: x.id,
-                                        posNo: x.isDirector == true ? orgChild4.orgChild4ShortName + x.posMasterNo: null,
+                                        posNo: orgChild4.orgChild4ShortName + x.posMasterNo,
                                         orgTreeId: orgChild4.id,
                                         orgLevel: 4,
                                         fullNameCurrentHolder: