diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts
index a2f4ad69..c2f2776c 100644
--- a/src/controllers/OrganizationController.ts
+++ b/src/controllers/OrganizationController.ts
@@ -2233,91 +2233,91 @@ export class OrganizationController extends Controller {
           responsibility: orgRoot.responsibility,
           labelName:
             orgRoot.orgRootName + " " + orgRoot.orgRootCode + "00" + " " + orgRoot.orgRootShortName,
-          totalPosition: await this.posMasterRepository.count({
-            where: { orgRevisionId: orgRoot.orgRevisionId, orgRootId: orgRoot.id },
-          }),
-          totalPositionCurrentUse: await this.posMasterRepository.count({
-            where: {
-              orgRevisionId: orgRoot.orgRevisionId,
-              orgRootId: orgRoot.id,
-              current_holderId: Not(IsNull()) || Not(""),
-            },
-          }),
-          totalPositionCurrentVacant: await this.posMasterRepository.count({
-            where: {
-              orgRevisionId: orgRoot.orgRevisionId,
-              orgRootId: orgRoot.id,
-              current_holderId: IsNull() || "",
-            },
-          }),
-          totalPositionNextUse: await this.posMasterRepository.count({
-            where: {
-              orgRevisionId: orgRoot.orgRevisionId,
-              orgRootId: orgRoot.id,
-              next_holderId: Not(IsNull()) || Not(""),
-            },
-          }),
-          totalPositionNextVacant: await this.posMasterRepository.count({
-            where: {
-              orgRevisionId: orgRoot.orgRevisionId,
-              orgRootId: orgRoot.id,
-              next_holderId: IsNull() || "",
-            },
-          }),
-          totalRootPosition: await this.posMasterRepository.count({
-            where: {
-              orgRevisionId: orgRoot.orgRevisionId,
-              orgRootId: orgRoot.id,
-              orgChild1Id: IsNull() || "",
-              orgChild2Id: IsNull() || "",
-              orgChild3Id: IsNull() || "",
-              orgChild4Id: IsNull() || "",
-            },
-          }),
-          totalRootPositionCurrentUse: await this.posMasterRepository.count({
-            where: {
-              orgRevisionId: orgRoot.orgRevisionId,
-              orgRootId: orgRoot.id,
-              orgChild1Id: IsNull() || "",
-              orgChild2Id: IsNull() || "",
-              orgChild3Id: IsNull() || "",
-              orgChild4Id: IsNull() || "",
-              current_holderId: Not(IsNull()) || Not(""),
-            },
-          }),
-          totalRootPositionCurrentVacant: await this.posMasterRepository.count({
-            where: {
-              orgRevisionId: orgRoot.orgRevisionId,
-              orgRootId: orgRoot.id,
-              orgChild1Id: IsNull() || "",
-              orgChild2Id: IsNull() || "",
-              orgChild3Id: IsNull() || "",
-              orgChild4Id: IsNull() || "",
-              current_holderId: IsNull() || "",
-            },
-          }),
-          totalRootPositionNextUse: await this.posMasterRepository.count({
-            where: {
-              orgRevisionId: orgRoot.orgRevisionId,
-              orgRootId: orgRoot.id,
-              orgChild1Id: IsNull() || "",
-              orgChild2Id: IsNull() || "",
-              orgChild3Id: IsNull() || "",
-              orgChild4Id: IsNull() || "",
-              next_holderId: Not(IsNull()) || Not(""),
-            },
-          }),
-          totalRootPositionNextVacant: await this.posMasterRepository.count({
-            where: {
-              orgRevisionId: orgRoot.orgRevisionId,
-              orgRootId: orgRoot.id,
-              orgChild1Id: IsNull() || "",
-              orgChild2Id: IsNull() || "",
-              orgChild3Id: IsNull() || "",
-              orgChild4Id: IsNull() || "",
-              next_holderId: IsNull() || "",
-            },
-          }),
+          // totalPosition: await this.posMasterRepository.count({
+          //   where: { orgRevisionId: orgRoot.orgRevisionId, orgRootId: orgRoot.id },
+          // }),
+          // totalPositionCurrentUse: await this.posMasterRepository.count({
+          //   where: {
+          //     orgRevisionId: orgRoot.orgRevisionId,
+          //     orgRootId: orgRoot.id,
+          //     current_holderId: Not(IsNull()) || Not(""),
+          //   },
+          // }),
+          // totalPositionCurrentVacant: await this.posMasterRepository.count({
+          //   where: {
+          //     orgRevisionId: orgRoot.orgRevisionId,
+          //     orgRootId: orgRoot.id,
+          //     current_holderId: IsNull() || "",
+          //   },
+          // }),
+          // totalPositionNextUse: await this.posMasterRepository.count({
+          //   where: {
+          //     orgRevisionId: orgRoot.orgRevisionId,
+          //     orgRootId: orgRoot.id,
+          //     next_holderId: Not(IsNull()) || Not(""),
+          //   },
+          // }),
+          // totalPositionNextVacant: await this.posMasterRepository.count({
+          //   where: {
+          //     orgRevisionId: orgRoot.orgRevisionId,
+          //     orgRootId: orgRoot.id,
+          //     next_holderId: IsNull() || "",
+          //   },
+          // }),
+          // totalRootPosition: await this.posMasterRepository.count({
+          //   where: {
+          //     orgRevisionId: orgRoot.orgRevisionId,
+          //     orgRootId: orgRoot.id,
+          //     orgChild1Id: IsNull() || "",
+          //     orgChild2Id: IsNull() || "",
+          //     orgChild3Id: IsNull() || "",
+          //     orgChild4Id: IsNull() || "",
+          //   },
+          // }),
+          // totalRootPositionCurrentUse: await this.posMasterRepository.count({
+          //   where: {
+          //     orgRevisionId: orgRoot.orgRevisionId,
+          //     orgRootId: orgRoot.id,
+          //     orgChild1Id: IsNull() || "",
+          //     orgChild2Id: IsNull() || "",
+          //     orgChild3Id: IsNull() || "",
+          //     orgChild4Id: IsNull() || "",
+          //     current_holderId: Not(IsNull()) || Not(""),
+          //   },
+          // }),
+          // totalRootPositionCurrentVacant: await this.posMasterRepository.count({
+          //   where: {
+          //     orgRevisionId: orgRoot.orgRevisionId,
+          //     orgRootId: orgRoot.id,
+          //     orgChild1Id: IsNull() || "",
+          //     orgChild2Id: IsNull() || "",
+          //     orgChild3Id: IsNull() || "",
+          //     orgChild4Id: IsNull() || "",
+          //     current_holderId: IsNull() || "",
+          //   },
+          // }),
+          // totalRootPositionNextUse: await this.posMasterRepository.count({
+          //   where: {
+          //     orgRevisionId: orgRoot.orgRevisionId,
+          //     orgRootId: orgRoot.id,
+          //     orgChild1Id: IsNull() || "",
+          //     orgChild2Id: IsNull() || "",
+          //     orgChild3Id: IsNull() || "",
+          //     orgChild4Id: IsNull() || "",
+          //     next_holderId: Not(IsNull()) || Not(""),
+          //   },
+          // }),
+          // totalRootPositionNextVacant: await this.posMasterRepository.count({
+          //   where: {
+          //     orgRevisionId: orgRoot.orgRevisionId,
+          //     orgRootId: orgRoot.id,
+          //     orgChild1Id: IsNull() || "",
+          //     orgChild2Id: IsNull() || "",
+          //     orgChild3Id: IsNull() || "",
+          //     orgChild4Id: IsNull() || "",
+          //     next_holderId: IsNull() || "",
+          //   },
+          // }),
 
           children: await Promise.all(
             orgChild1Data
@@ -2362,91 +2362,91 @@ export class OrganizationController extends Controller {
                   "00" +
                   " " +
                   orgRoot.orgRootShortName,
-                totalPosition: await this.posMasterRepository.count({
-                  where: { orgRevisionId: orgRoot.orgRevisionId, orgChild1Id: orgChild1.id },
-                }),
-                totalPositionCurrentUse: await this.posMasterRepository.count({
-                  where: {
-                    orgRevisionId: orgRoot.orgRevisionId,
-                    orgChild1Id: orgChild1.id,
-                    current_holderId: Not(IsNull()) || Not(""),
-                  },
-                }),
-                totalPositionCurrentVacant: await this.posMasterRepository.count({
-                  where: {
-                    orgRevisionId: orgRoot.orgRevisionId,
-                    orgChild1Id: orgChild1.id,
-                    current_holderId: IsNull() || "",
-                  },
-                }),
-                totalPositionNextUse: await this.posMasterRepository.count({
-                  where: {
-                    orgRevisionId: orgRoot.orgRevisionId,
-                    orgChild1Id: orgChild1.id,
-                    next_holderId: Not(IsNull()) || Not(""),
-                  },
-                }),
-                totalPositionNextVacant: await this.posMasterRepository.count({
-                  where: {
-                    orgRevisionId: orgRoot.orgRevisionId,
-                    orgChild1Id: orgChild1.id,
-                    next_holderId: IsNull() || "",
-                  },
-                }),
-                totalRootPosition: await this.posMasterRepository.count({
-                  where: {
-                    orgRevisionId: orgRoot.orgRevisionId,
-                    orgRootId: orgRoot.id,
-                    orgChild1Id: orgChild1.id,
-                    orgChild2Id: IsNull() || "",
-                    orgChild3Id: IsNull() || "",
-                    orgChild4Id: IsNull() || "",
-                  },
-                }),
-                totalRootPositionCurrentUse: await this.posMasterRepository.count({
-                  where: {
-                    orgRevisionId: orgRoot.orgRevisionId,
-                    orgRootId: orgRoot.id,
-                    orgChild1Id: orgChild1.id,
-                    orgChild2Id: IsNull() || "",
-                    orgChild3Id: IsNull() || "",
-                    orgChild4Id: IsNull() || "",
-                    current_holderId: Not(IsNull()) || Not(""),
-                  },
-                }),
-                totalRootPositionCurrentVacant: await this.posMasterRepository.count({
-                  where: {
-                    orgRevisionId: orgRoot.orgRevisionId,
-                    orgRootId: orgRoot.id,
-                    orgChild1Id: orgChild1.id,
-                    orgChild2Id: IsNull() || "",
-                    orgChild3Id: IsNull() || "",
-                    orgChild4Id: IsNull() || "",
-                    current_holderId: IsNull() || "",
-                  },
-                }),
-                totalRootPositionNextUse: await this.posMasterRepository.count({
-                  where: {
-                    orgRevisionId: orgRoot.orgRevisionId,
-                    orgRootId: orgRoot.id,
-                    orgChild1Id: orgChild1.id,
-                    orgChild2Id: IsNull() || "",
-                    orgChild3Id: IsNull() || "",
-                    orgChild4Id: IsNull() || "",
-                    next_holderId: Not(IsNull()) || Not(""),
-                  },
-                }),
-                totalRootPositionNextVacant: await this.posMasterRepository.count({
-                  where: {
-                    orgRevisionId: orgRoot.orgRevisionId,
-                    orgRootId: orgRoot.id,
-                    orgChild1Id: orgChild1.id,
-                    orgChild2Id: IsNull() || "",
-                    orgChild3Id: IsNull() || "",
-                    orgChild4Id: IsNull() || "",
-                    next_holderId: IsNull() || "",
-                  },
-                }),
+                // totalPosition: await this.posMasterRepository.count({
+                //   where: { orgRevisionId: orgRoot.orgRevisionId, orgChild1Id: orgChild1.id },
+                // }),
+                // totalPositionCurrentUse: await this.posMasterRepository.count({
+                //   where: {
+                //     orgRevisionId: orgRoot.orgRevisionId,
+                //     orgChild1Id: orgChild1.id,
+                //     current_holderId: Not(IsNull()) || Not(""),
+                //   },
+                // }),
+                // totalPositionCurrentVacant: await this.posMasterRepository.count({
+                //   where: {
+                //     orgRevisionId: orgRoot.orgRevisionId,
+                //     orgChild1Id: orgChild1.id,
+                //     current_holderId: IsNull() || "",
+                //   },
+                // }),
+                // totalPositionNextUse: await this.posMasterRepository.count({
+                //   where: {
+                //     orgRevisionId: orgRoot.orgRevisionId,
+                //     orgChild1Id: orgChild1.id,
+                //     next_holderId: Not(IsNull()) || Not(""),
+                //   },
+                // }),
+                // totalPositionNextVacant: await this.posMasterRepository.count({
+                //   where: {
+                //     orgRevisionId: orgRoot.orgRevisionId,
+                //     orgChild1Id: orgChild1.id,
+                //     next_holderId: IsNull() || "",
+                //   },
+                // }),
+                // totalRootPosition: await this.posMasterRepository.count({
+                //   where: {
+                //     orgRevisionId: orgRoot.orgRevisionId,
+                //     orgRootId: orgRoot.id,
+                //     orgChild1Id: orgChild1.id,
+                //     orgChild2Id: IsNull() || "",
+                //     orgChild3Id: IsNull() || "",
+                //     orgChild4Id: IsNull() || "",
+                //   },
+                // }),
+                // totalRootPositionCurrentUse: await this.posMasterRepository.count({
+                //   where: {
+                //     orgRevisionId: orgRoot.orgRevisionId,
+                //     orgRootId: orgRoot.id,
+                //     orgChild1Id: orgChild1.id,
+                //     orgChild2Id: IsNull() || "",
+                //     orgChild3Id: IsNull() || "",
+                //     orgChild4Id: IsNull() || "",
+                //     current_holderId: Not(IsNull()) || Not(""),
+                //   },
+                // }),
+                // totalRootPositionCurrentVacant: await this.posMasterRepository.count({
+                //   where: {
+                //     orgRevisionId: orgRoot.orgRevisionId,
+                //     orgRootId: orgRoot.id,
+                //     orgChild1Id: orgChild1.id,
+                //     orgChild2Id: IsNull() || "",
+                //     orgChild3Id: IsNull() || "",
+                //     orgChild4Id: IsNull() || "",
+                //     current_holderId: IsNull() || "",
+                //   },
+                // }),
+                // totalRootPositionNextUse: await this.posMasterRepository.count({
+                //   where: {
+                //     orgRevisionId: orgRoot.orgRevisionId,
+                //     orgRootId: orgRoot.id,
+                //     orgChild1Id: orgChild1.id,
+                //     orgChild2Id: IsNull() || "",
+                //     orgChild3Id: IsNull() || "",
+                //     orgChild4Id: IsNull() || "",
+                //     next_holderId: Not(IsNull()) || Not(""),
+                //   },
+                // }),
+                // totalRootPositionNextVacant: await this.posMasterRepository.count({
+                //   where: {
+                //     orgRevisionId: orgRoot.orgRevisionId,
+                //     orgRootId: orgRoot.id,
+                //     orgChild1Id: orgChild1.id,
+                //     orgChild2Id: IsNull() || "",
+                //     orgChild3Id: IsNull() || "",
+                //     orgChild4Id: IsNull() || "",
+                //     next_holderId: IsNull() || "",
+                //   },
+                // }),
 
                 children: await Promise.all(
                   orgChild2Data
@@ -2496,94 +2496,94 @@ export class OrganizationController extends Controller {
                         "00" +
                         " " +
                         orgRoot.orgRootShortName,
-                      totalPosition: await this.posMasterRepository.count({
-                        where: {
-                          orgRevisionId: orgRoot.orgRevisionId,
-                          orgChild2Id: orgChild2.id,
-                        },
-                      }),
-                      totalPositionCurrentUse: await this.posMasterRepository.count({
-                        where: {
-                          orgRevisionId: orgRoot.orgRevisionId,
-                          orgChild2Id: orgChild2.id,
-                          current_holderId: Not(IsNull()) || Not(""),
-                        },
-                      }),
-                      totalPositionCurrentVacant: await this.posMasterRepository.count({
-                        where: {
-                          orgRevisionId: orgRoot.orgRevisionId,
-                          orgChild2Id: orgChild2.id,
-                          current_holderId: IsNull() || "",
-                        },
-                      }),
-                      totalPositionNextUse: await this.posMasterRepository.count({
-                        where: {
-                          orgRevisionId: orgRoot.orgRevisionId,
-                          orgChild2Id: orgChild2.id,
-                          next_holderId: Not(IsNull()) || Not(""),
-                        },
-                      }),
-                      totalPositionNextVacant: await this.posMasterRepository.count({
-                        where: {
-                          orgRevisionId: orgRoot.orgRevisionId,
-                          orgChild2Id: orgChild2.id,
-                          next_holderId: IsNull() || "",
-                        },
-                      }),
-                      totalRootPosition: await this.posMasterRepository.count({
-                        where: {
-                          orgRevisionId: orgRoot.orgRevisionId,
-                          orgRootId: orgRoot.id,
-                          orgChild1Id: orgChild1.id,
-                          orgChild2Id: orgChild2.id,
-                          orgChild3Id: IsNull() || "",
-                          orgChild4Id: IsNull() || "",
-                        },
-                      }),
-                      totalRootPositionCurrentUse: await this.posMasterRepository.count({
-                        where: {
-                          orgRevisionId: orgRoot.orgRevisionId,
-                          orgRootId: orgRoot.id,
-                          orgChild1Id: orgChild1.id,
-                          orgChild2Id: orgChild2.id,
-                          orgChild3Id: IsNull() || "",
-                          orgChild4Id: IsNull() || "",
-                          current_holderId: Not(IsNull()) || Not(""),
-                        },
-                      }),
-                      totalRootPositionCurrentVacant: await this.posMasterRepository.count({
-                        where: {
-                          orgRevisionId: orgRoot.orgRevisionId,
-                          orgRootId: orgRoot.id,
-                          orgChild1Id: orgChild1.id,
-                          orgChild2Id: orgChild2.id,
-                          orgChild3Id: IsNull() || "",
-                          orgChild4Id: IsNull() || "",
-                          current_holderId: IsNull() || "",
-                        },
-                      }),
-                      totalRootPositionNextUse: await this.posMasterRepository.count({
-                        where: {
-                          orgRevisionId: orgRoot.orgRevisionId,
-                          orgRootId: orgRoot.id,
-                          orgChild1Id: orgChild1.id,
-                          orgChild2Id: orgChild2.id,
-                          orgChild3Id: IsNull() || "",
-                          orgChild4Id: IsNull() || "",
-                          next_holderId: Not(IsNull()) || Not(""),
-                        },
-                      }),
-                      totalRootPositionNextVacant: await this.posMasterRepository.count({
-                        where: {
-                          orgRevisionId: orgRoot.orgRevisionId,
-                          orgRootId: orgRoot.id,
-                          orgChild1Id: orgChild1.id,
-                          orgChild2Id: orgChild2.id,
-                          orgChild3Id: IsNull() || "",
-                          orgChild4Id: IsNull() || "",
-                          next_holderId: IsNull() || "",
-                        },
-                      }),
+                      // totalPosition: await this.posMasterRepository.count({
+                      //   where: {
+                      //     orgRevisionId: orgRoot.orgRevisionId,
+                      //     orgChild2Id: orgChild2.id,
+                      //   },
+                      // }),
+                      // totalPositionCurrentUse: await this.posMasterRepository.count({
+                      //   where: {
+                      //     orgRevisionId: orgRoot.orgRevisionId,
+                      //     orgChild2Id: orgChild2.id,
+                      //     current_holderId: Not(IsNull()) || Not(""),
+                      //   },
+                      // }),
+                      // totalPositionCurrentVacant: await this.posMasterRepository.count({
+                      //   where: {
+                      //     orgRevisionId: orgRoot.orgRevisionId,
+                      //     orgChild2Id: orgChild2.id,
+                      //     current_holderId: IsNull() || "",
+                      //   },
+                      // }),
+                      // totalPositionNextUse: await this.posMasterRepository.count({
+                      //   where: {
+                      //     orgRevisionId: orgRoot.orgRevisionId,
+                      //     orgChild2Id: orgChild2.id,
+                      //     next_holderId: Not(IsNull()) || Not(""),
+                      //   },
+                      // }),
+                      // totalPositionNextVacant: await this.posMasterRepository.count({
+                      //   where: {
+                      //     orgRevisionId: orgRoot.orgRevisionId,
+                      //     orgChild2Id: orgChild2.id,
+                      //     next_holderId: IsNull() || "",
+                      //   },
+                      // }),
+                      // totalRootPosition: await this.posMasterRepository.count({
+                      //   where: {
+                      //     orgRevisionId: orgRoot.orgRevisionId,
+                      //     orgRootId: orgRoot.id,
+                      //     orgChild1Id: orgChild1.id,
+                      //     orgChild2Id: orgChild2.id,
+                      //     orgChild3Id: IsNull() || "",
+                      //     orgChild4Id: IsNull() || "",
+                      //   },
+                      // }),
+                      // totalRootPositionCurrentUse: await this.posMasterRepository.count({
+                      //   where: {
+                      //     orgRevisionId: orgRoot.orgRevisionId,
+                      //     orgRootId: orgRoot.id,
+                      //     orgChild1Id: orgChild1.id,
+                      //     orgChild2Id: orgChild2.id,
+                      //     orgChild3Id: IsNull() || "",
+                      //     orgChild4Id: IsNull() || "",
+                      //     current_holderId: Not(IsNull()) || Not(""),
+                      //   },
+                      // }),
+                      // totalRootPositionCurrentVacant: await this.posMasterRepository.count({
+                      //   where: {
+                      //     orgRevisionId: orgRoot.orgRevisionId,
+                      //     orgRootId: orgRoot.id,
+                      //     orgChild1Id: orgChild1.id,
+                      //     orgChild2Id: orgChild2.id,
+                      //     orgChild3Id: IsNull() || "",
+                      //     orgChild4Id: IsNull() || "",
+                      //     current_holderId: IsNull() || "",
+                      //   },
+                      // }),
+                      // totalRootPositionNextUse: await this.posMasterRepository.count({
+                      //   where: {
+                      //     orgRevisionId: orgRoot.orgRevisionId,
+                      //     orgRootId: orgRoot.id,
+                      //     orgChild1Id: orgChild1.id,
+                      //     orgChild2Id: orgChild2.id,
+                      //     orgChild3Id: IsNull() || "",
+                      //     orgChild4Id: IsNull() || "",
+                      //     next_holderId: Not(IsNull()) || Not(""),
+                      //   },
+                      // }),
+                      // totalRootPositionNextVacant: await this.posMasterRepository.count({
+                      //   where: {
+                      //     orgRevisionId: orgRoot.orgRevisionId,
+                      //     orgRootId: orgRoot.id,
+                      //     orgChild1Id: orgChild1.id,
+                      //     orgChild2Id: orgChild2.id,
+                      //     orgChild3Id: IsNull() || "",
+                      //     orgChild4Id: IsNull() || "",
+                      //     next_holderId: IsNull() || "",
+                      //   },
+                      // }),
 
                       children: await Promise.all(
                         orgChild3Data
@@ -2640,94 +2640,94 @@ export class OrganizationController extends Controller {
                               "00" +
                               " " +
                               orgRoot.orgRootShortName,
-                            totalPosition: await this.posMasterRepository.count({
-                              where: {
-                                orgRevisionId: orgRoot.orgRevisionId,
-                                orgChild3Id: orgChild3.id,
-                              },
-                            }),
-                            totalPositionCurrentUse: await this.posMasterRepository.count({
-                              where: {
-                                orgRevisionId: orgRoot.orgRevisionId,
-                                orgChild3Id: orgChild3.id,
-                                current_holderId: Not(IsNull()) || Not(""),
-                              },
-                            }),
-                            totalPositionCurrentVacant: await this.posMasterRepository.count({
-                              where: {
-                                orgRevisionId: orgRoot.orgRevisionId,
-                                orgChild3Id: orgChild3.id,
-                                current_holderId: IsNull() || "",
-                              },
-                            }),
-                            totalPositionNextUse: await this.posMasterRepository.count({
-                              where: {
-                                orgRevisionId: orgRoot.orgRevisionId,
-                                orgChild3Id: orgChild3.id,
-                                next_holderId: Not(IsNull()) || Not(""),
-                              },
-                            }),
-                            totalPositionNextVacant: await this.posMasterRepository.count({
-                              where: {
-                                orgRevisionId: orgRoot.orgRevisionId,
-                                orgChild3Id: orgChild3.id,
-                                next_holderId: IsNull() || "",
-                              },
-                            }),
-                            totalRootPosition: await this.posMasterRepository.count({
-                              where: {
-                                orgRevisionId: orgRoot.orgRevisionId,
-                                orgRootId: orgRoot.id,
-                                orgChild1Id: orgChild1.id,
-                                orgChild2Id: orgChild2.id,
-                                orgChild3Id: orgChild3.id,
-                                orgChild4Id: IsNull() || "",
-                              },
-                            }),
-                            totalRootPositionCurrentUse: await this.posMasterRepository.count({
-                              where: {
-                                orgRevisionId: orgRoot.orgRevisionId,
-                                orgRootId: orgRoot.id,
-                                orgChild1Id: orgChild1.id,
-                                orgChild2Id: orgChild2.id,
-                                orgChild3Id: orgChild3.id,
-                                orgChild4Id: IsNull() || "",
-                                current_holderId: Not(IsNull()) || Not(""),
-                              },
-                            }),
-                            totalRootPositionCurrentVacant: await this.posMasterRepository.count({
-                              where: {
-                                orgRevisionId: orgRoot.orgRevisionId,
-                                orgRootId: orgRoot.id,
-                                orgChild1Id: orgChild1.id,
-                                orgChild2Id: orgChild2.id,
-                                orgChild3Id: orgChild3.id,
-                                orgChild4Id: IsNull() || "",
-                                current_holderId: IsNull() || "",
-                              },
-                            }),
-                            totalRootPositionNextUse: await this.posMasterRepository.count({
-                              where: {
-                                orgRevisionId: orgRoot.orgRevisionId,
-                                orgRootId: orgRoot.id,
-                                orgChild1Id: orgChild1.id,
-                                orgChild2Id: orgChild2.id,
-                                orgChild3Id: orgChild3.id,
-                                orgChild4Id: IsNull() || "",
-                                next_holderId: Not(IsNull()) || Not(""),
-                              },
-                            }),
-                            totalRootPositionNextVacant: await this.posMasterRepository.count({
-                              where: {
-                                orgRevisionId: orgRoot.orgRevisionId,
-                                orgRootId: orgRoot.id,
-                                orgChild1Id: orgChild1.id,
-                                orgChild2Id: orgChild2.id,
-                                orgChild3Id: orgChild3.id,
-                                orgChild4Id: IsNull() || "",
-                                next_holderId: IsNull() || "",
-                              },
-                            }),
+                            // totalPosition: await this.posMasterRepository.count({
+                            //   where: {
+                            //     orgRevisionId: orgRoot.orgRevisionId,
+                            //     orgChild3Id: orgChild3.id,
+                            //   },
+                            // }),
+                            // totalPositionCurrentUse: await this.posMasterRepository.count({
+                            //   where: {
+                            //     orgRevisionId: orgRoot.orgRevisionId,
+                            //     orgChild3Id: orgChild3.id,
+                            //     current_holderId: Not(IsNull()) || Not(""),
+                            //   },
+                            // }),
+                            // totalPositionCurrentVacant: await this.posMasterRepository.count({
+                            //   where: {
+                            //     orgRevisionId: orgRoot.orgRevisionId,
+                            //     orgChild3Id: orgChild3.id,
+                            //     current_holderId: IsNull() || "",
+                            //   },
+                            // }),
+                            // totalPositionNextUse: await this.posMasterRepository.count({
+                            //   where: {
+                            //     orgRevisionId: orgRoot.orgRevisionId,
+                            //     orgChild3Id: orgChild3.id,
+                            //     next_holderId: Not(IsNull()) || Not(""),
+                            //   },
+                            // }),
+                            // totalPositionNextVacant: await this.posMasterRepository.count({
+                            //   where: {
+                            //     orgRevisionId: orgRoot.orgRevisionId,
+                            //     orgChild3Id: orgChild3.id,
+                            //     next_holderId: IsNull() || "",
+                            //   },
+                            // }),
+                            // totalRootPosition: await this.posMasterRepository.count({
+                            //   where: {
+                            //     orgRevisionId: orgRoot.orgRevisionId,
+                            //     orgRootId: orgRoot.id,
+                            //     orgChild1Id: orgChild1.id,
+                            //     orgChild2Id: orgChild2.id,
+                            //     orgChild3Id: orgChild3.id,
+                            //     orgChild4Id: IsNull() || "",
+                            //   },
+                            // }),
+                            // totalRootPositionCurrentUse: await this.posMasterRepository.count({
+                            //   where: {
+                            //     orgRevisionId: orgRoot.orgRevisionId,
+                            //     orgRootId: orgRoot.id,
+                            //     orgChild1Id: orgChild1.id,
+                            //     orgChild2Id: orgChild2.id,
+                            //     orgChild3Id: orgChild3.id,
+                            //     orgChild4Id: IsNull() || "",
+                            //     current_holderId: Not(IsNull()) || Not(""),
+                            //   },
+                            // }),
+                            // totalRootPositionCurrentVacant: await this.posMasterRepository.count({
+                            //   where: {
+                            //     orgRevisionId: orgRoot.orgRevisionId,
+                            //     orgRootId: orgRoot.id,
+                            //     orgChild1Id: orgChild1.id,
+                            //     orgChild2Id: orgChild2.id,
+                            //     orgChild3Id: orgChild3.id,
+                            //     orgChild4Id: IsNull() || "",
+                            //     current_holderId: IsNull() || "",
+                            //   },
+                            // }),
+                            // totalRootPositionNextUse: await this.posMasterRepository.count({
+                            //   where: {
+                            //     orgRevisionId: orgRoot.orgRevisionId,
+                            //     orgRootId: orgRoot.id,
+                            //     orgChild1Id: orgChild1.id,
+                            //     orgChild2Id: orgChild2.id,
+                            //     orgChild3Id: orgChild3.id,
+                            //     orgChild4Id: IsNull() || "",
+                            //     next_holderId: Not(IsNull()) || Not(""),
+                            //   },
+                            // }),
+                            // totalRootPositionNextVacant: await this.posMasterRepository.count({
+                            //   where: {
+                            //     orgRevisionId: orgRoot.orgRevisionId,
+                            //     orgRootId: orgRoot.id,
+                            //     orgChild1Id: orgChild1.id,
+                            //     orgChild2Id: orgChild2.id,
+                            //     orgChild3Id: orgChild3.id,
+                            //     orgChild4Id: IsNull() || "",
+                            //     next_holderId: IsNull() || "",
+                            //   },
+                            // }),
 
                             children: await Promise.all(
                               orgChild4Data
@@ -2791,99 +2791,99 @@ export class OrganizationController extends Controller {
                                     "00" +
                                     " " +
                                     orgRoot.orgRootShortName,
-                                  totalPosition: await this.posMasterRepository.count({
-                                    where: {
-                                      orgRevisionId: orgRoot.orgRevisionId,
-                                      orgChild4Id: orgChild4.id,
-                                    },
-                                  }),
-                                  totalPositionCurrentUse: await this.posMasterRepository.count({
-                                    where: {
-                                      orgRevisionId: orgRoot.orgRevisionId,
-                                      orgChild4Id: orgChild4.id,
-                                      current_holderId: Not(IsNull()) || Not(""),
-                                    },
-                                  }),
-                                  totalPositionCurrentVacant: await this.posMasterRepository.count({
-                                    where: {
-                                      orgRevisionId: orgRoot.orgRevisionId,
-                                      orgChild4Id: orgChild4.id,
-                                      current_holderId: IsNull() || "",
-                                    },
-                                  }),
-                                  totalPositionNextUse: await this.posMasterRepository.count({
-                                    where: {
-                                      orgRevisionId: orgRoot.orgRevisionId,
-                                      orgChild4Id: orgChild4.id,
-                                      next_holderId: Not(IsNull()) || Not(""),
-                                    },
-                                  }),
-                                  totalPositionNextVacant: await this.posMasterRepository.count({
-                                    where: {
-                                      orgRevisionId: orgRoot.orgRevisionId,
-                                      orgChild4Id: orgChild4.id,
-                                      next_holderId: IsNull() || "",
-                                    },
-                                  }),
-                                  totalRootPosition: await this.posMasterRepository.count({
-                                    where: {
-                                      orgRevisionId: orgRoot.orgRevisionId,
-                                      orgRootId: orgRoot.id,
-                                      orgChild1Id: orgChild1.id,
-                                      orgChild2Id: orgChild2.id,
-                                      orgChild3Id: orgChild3.id,
-                                      orgChild4Id: orgChild4.id,
-                                    },
-                                  }),
-                                  totalRootPositionCurrentUse: await this.posMasterRepository.count(
-                                    {
-                                      where: {
-                                        orgRevisionId: orgRoot.orgRevisionId,
-                                        orgRootId: orgRoot.id,
-                                        orgChild1Id: orgChild1.id,
-                                        orgChild2Id: orgChild2.id,
-                                        orgChild3Id: orgChild3.id,
-                                        orgChild4Id: orgChild4.id,
-                                        current_holderId: Not(IsNull()) || Not(""),
-                                      },
-                                    },
-                                  ),
-                                  totalRootPositionCurrentVacant:
-                                    await this.posMasterRepository.count({
-                                      where: {
-                                        orgRevisionId: orgRoot.orgRevisionId,
-                                        orgRootId: orgRoot.id,
-                                        orgChild1Id: orgChild1.id,
-                                        orgChild2Id: orgChild2.id,
-                                        orgChild3Id: orgChild3.id,
-                                        orgChild4Id: orgChild4.id,
-                                        current_holderId: IsNull() || "",
-                                      },
-                                    }),
-                                  totalRootPositionNextUse: await this.posMasterRepository.count({
-                                    where: {
-                                      orgRevisionId: orgRoot.orgRevisionId,
-                                      orgRootId: orgRoot.id,
-                                      orgChild1Id: orgChild1.id,
-                                      orgChild2Id: orgChild2.id,
-                                      orgChild3Id: orgChild3.id,
-                                      orgChild4Id: orgChild4.id,
-                                      next_holderId: Not(IsNull()) || Not(""),
-                                    },
-                                  }),
-                                  totalRootPositionNextVacant: await this.posMasterRepository.count(
-                                    {
-                                      where: {
-                                        orgRevisionId: orgRoot.orgRevisionId,
-                                        orgRootId: orgRoot.id,
-                                        orgChild1Id: orgChild1.id,
-                                        orgChild2Id: orgChild2.id,
-                                        orgChild3Id: orgChild3.id,
-                                        orgChild4Id: orgChild4.id,
-                                        next_holderId: IsNull() || "",
-                                      },
-                                    },
-                                  ),
+                                  // totalPosition: await this.posMasterRepository.count({
+                                  //   where: {
+                                  //     orgRevisionId: orgRoot.orgRevisionId,
+                                  //     orgChild4Id: orgChild4.id,
+                                  //   },
+                                  // }),
+                                  // totalPositionCurrentUse: await this.posMasterRepository.count({
+                                  //   where: {
+                                  //     orgRevisionId: orgRoot.orgRevisionId,
+                                  //     orgChild4Id: orgChild4.id,
+                                  //     current_holderId: Not(IsNull()) || Not(""),
+                                  //   },
+                                  // }),
+                                  // totalPositionCurrentVacant: await this.posMasterRepository.count({
+                                  //   where: {
+                                  //     orgRevisionId: orgRoot.orgRevisionId,
+                                  //     orgChild4Id: orgChild4.id,
+                                  //     current_holderId: IsNull() || "",
+                                  //   },
+                                  // }),
+                                  // totalPositionNextUse: await this.posMasterRepository.count({
+                                  //   where: {
+                                  //     orgRevisionId: orgRoot.orgRevisionId,
+                                  //     orgChild4Id: orgChild4.id,
+                                  //     next_holderId: Not(IsNull()) || Not(""),
+                                  //   },
+                                  // }),
+                                  // totalPositionNextVacant: await this.posMasterRepository.count({
+                                  //   where: {
+                                  //     orgRevisionId: orgRoot.orgRevisionId,
+                                  //     orgChild4Id: orgChild4.id,
+                                  //     next_holderId: IsNull() || "",
+                                  //   },
+                                  // }),
+                                  // totalRootPosition: await this.posMasterRepository.count({
+                                  //   where: {
+                                  //     orgRevisionId: orgRoot.orgRevisionId,
+                                  //     orgRootId: orgRoot.id,
+                                  //     orgChild1Id: orgChild1.id,
+                                  //     orgChild2Id: orgChild2.id,
+                                  //     orgChild3Id: orgChild3.id,
+                                  //     orgChild4Id: orgChild4.id,
+                                  //   },
+                                  // }),
+                                  // totalRootPositionCurrentUse: await this.posMasterRepository.count(
+                                  //   {
+                                  //     where: {
+                                  //       orgRevisionId: orgRoot.orgRevisionId,
+                                  //       orgRootId: orgRoot.id,
+                                  //       orgChild1Id: orgChild1.id,
+                                  //       orgChild2Id: orgChild2.id,
+                                  //       orgChild3Id: orgChild3.id,
+                                  //       orgChild4Id: orgChild4.id,
+                                  //       current_holderId: Not(IsNull()) || Not(""),
+                                  //     },
+                                  //   },
+                                  // ),
+                                  // totalRootPositionCurrentVacant:
+                                  //   await this.posMasterRepository.count({
+                                  //     where: {
+                                  //       orgRevisionId: orgRoot.orgRevisionId,
+                                  //       orgRootId: orgRoot.id,
+                                  //       orgChild1Id: orgChild1.id,
+                                  //       orgChild2Id: orgChild2.id,
+                                  //       orgChild3Id: orgChild3.id,
+                                  //       orgChild4Id: orgChild4.id,
+                                  //       current_holderId: IsNull() || "",
+                                  //     },
+                                  //   }),
+                                  // totalRootPositionNextUse: await this.posMasterRepository.count({
+                                  //   where: {
+                                  //     orgRevisionId: orgRoot.orgRevisionId,
+                                  //     orgRootId: orgRoot.id,
+                                  //     orgChild1Id: orgChild1.id,
+                                  //     orgChild2Id: orgChild2.id,
+                                  //     orgChild3Id: orgChild3.id,
+                                  //     orgChild4Id: orgChild4.id,
+                                  //     next_holderId: Not(IsNull()) || Not(""),
+                                  //   },
+                                  // }),
+                                  // totalRootPositionNextVacant: await this.posMasterRepository.count(
+                                  //   {
+                                  //     where: {
+                                  //       orgRevisionId: orgRoot.orgRevisionId,
+                                  //       orgRootId: orgRoot.id,
+                                  //       orgChild1Id: orgChild1.id,
+                                  //       orgChild2Id: orgChild2.id,
+                                  //       orgChild3Id: orgChild3.id,
+                                  //       orgChild4Id: orgChild4.id,
+                                  //       next_holderId: IsNull() || "",
+                                  //     },
+                                  //   },
+                                  // ),
                                 })),
                             ),
                           })),
diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts
index 5d4bcca3..7ea9c45b 100644
--- a/src/controllers/PositionController.ts
+++ b/src/controllers/PositionController.ts
@@ -1919,6 +1919,7 @@ export class PositionController extends Controller {
         return {
           id: posMaster.id,
           current_holderId: posMaster.current_holderId,
+          next_holderId: posMaster.next_holderId,
           isDirector: posMaster.isDirector,
           orgRootId: posMaster.orgRootId,
           orgChild1Id: posMaster.orgChild1Id,
@@ -2354,6 +2355,7 @@ export class PositionController extends Controller {
         return {
           id: posMaster.id,
           current_holderId: posMaster.current_holderId,
+          next_holderId: posMaster.next_holderId,
           isDirector: posMaster.isDirector,
           orgRootId: posMaster.orgRootId,
           orgChild1Id: posMaster.orgChild1Id,
diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index d95bdf1a..9cc51e44 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -8112,6 +8112,7 @@ export class ProfileController extends Controller {
           ? `${profile.profileEducations[0].degree ?? ""} ${profile.profileEducations[0].field ?? ""}`
           : "",
       dateAppoint: profile.dateAppoint,
+      avatarUrl: profile.avatar && profile.avatarName ? `${profile.avatar}/${profile.avatarName}` : null
     };
 
     if (_profile.child4Id != null) {