diff --git a/src/controllers/OrganizationDotnetController.ts b/src/controllers/OrganizationDotnetController.ts
index 52fbd5cd..26203523 100644
--- a/src/controllers/OrganizationDotnetController.ts
+++ b/src/controllers/OrganizationDotnetController.ts
@@ -4400,46 +4400,59 @@ export class OrganizationDotnetController extends Controller {
   ) {
     let typeCondition: any = {};
     if (body.role === "CHILD" || body.role === "PARENT") {
-      switch (body.node) {
-        case 0:
-          typeCondition = {
-            orgRoot: {
-              ancestorDNA: body.nodeId,
-            },
-          };
-          break;
-        case 1:
-          typeCondition = {
-            orgChild1: {
-              ancestorDNA: body.nodeId,
-            },
-          };
-          break;
-        case 2:
-          typeCondition = {
-            orgChild2: {
-              ancestorDNA: body.nodeId,
-            },
-          };
-          break;
-        case 3:
-          typeCondition = {
-            orgChild3: {
-              ancestorDNA: body.nodeId,
-            },
-          };
-          break;
-        case 4:
-          typeCondition = {
-            orgChild4: {
-              ancestorDNA: body.nodeId,
-            },
-          };
-          break;
-        default:
-          typeCondition = {};
-          break;
+      if (body.role === "CHILD") {
+        switch (body.node) {
+          case 0:
+            typeCondition = {
+              orgRoot: {
+                ancestorDNA: body.nodeId,
+              },
+            };
+            break;
+          case 1:
+            typeCondition = {
+              orgChild1: {
+                ancestorDNA: body.nodeId,
+              },
+            };
+            break;
+          case 2:
+            typeCondition = {
+              orgChild2: {
+                ancestorDNA: body.nodeId,
+              },
+            };
+            break;
+          case 3:
+            typeCondition = {
+              orgChild3: {
+                ancestorDNA: body.nodeId,
+              },
+            };
+            break;
+          case 4:
+            typeCondition = {
+              orgChild4: {
+                ancestorDNA: body.nodeId,
+              },
+            };
+            break;
+          default:
+            typeCondition = {};
+            break;
+        }
       }
+      else if (body.role === "PARENT") {
+        typeCondition = {
+          orgRoot: {
+            ancestorDNA: body.nodeId
+          },
+          current_holders: {
+            orgChild1: Not(IsNull()),
+          },
+        };
+      }
+      
     } else if (body.role === "OWNER" || body.role === "ROOT") {
       switch (body.reqNode) {
         case 0:
@@ -4995,49 +5008,62 @@ export class OrganizationDotnetController extends Controller {
   ) {
     let typeCondition: any = {};
     if (body.role === "CHILD" || body.role === "PARENT") {
-      switch (body.node) {
-        case 0:
-          typeCondition = {
-            orgRoot: {
-              ancestorDNA: body.nodeId,
-            },
-          };
-          break;
-        case 1:
-          typeCondition = {
-            orgChild1: {
-              ancestorDNA: body.nodeId,
-            },
-          };
-          break;
-        case 2:
-          typeCondition = {
-            orgChild2: {
-              ancestorDNA: body.nodeId,
-            },
-          };
-          break;
-        case 3:
-          typeCondition = {
-            orgChild3: {
-              ancestorDNA: body.nodeId,
-            },
-          };
-          break;
-        case 4:
-          typeCondition = {
-            orgChild4: {
-              ancestorDNA: body.nodeId,
-            },
-          };
-          break;
-        case null:
-          typeCondition = {};
-          break;
-        default:
-          typeCondition = {};
-          break;
+      if (body.role === "CHILD") {
+        switch (body.node) {
+          case 0:
+            typeCondition = {
+              orgRoot: {
+                ancestorDNA: body.nodeId,
+              },
+            };
+            break;
+          case 1:
+            typeCondition = {
+              orgChild1: {
+                ancestorDNA: body.nodeId,
+              },
+            };
+            break;
+          case 2:
+            typeCondition = {
+              orgChild2: {
+                ancestorDNA: body.nodeId,
+              },
+            };
+            break;
+          case 3:
+            typeCondition = {
+              orgChild3: {
+                ancestorDNA: body.nodeId,
+              },
+            };
+            break;
+          case 4:
+            typeCondition = {
+              orgChild4: {
+                ancestorDNA: body.nodeId,
+              },
+            };
+            break;
+          case null:
+            typeCondition = {};
+            break;
+          default:
+            typeCondition = {};
+            break;
+        }
       }
+      else if (body.role === "PARENT") {
+        typeCondition = {
+          orgRoot: {
+            ancestorDNA: body.nodeId
+          },
+          current_holders: {
+            orgChild1: Not(IsNull()),
+          },
+        };
+      }
+      
     } else if (body.role === "OWNER" || body.role === "ROOT") {
       switch (body.reqNode) {
         case 0: