diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/OrgMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/OrgMapper.java
index 28bdac865..968557be4 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/OrgMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/OrgMapper.java
@@ -39,7 +39,7 @@ public interface OrgMapper {
     void updateOrg(JSONObject org);
 
     @AutoSql(type = SqlType.SELECT)
-    @AdvanceSelect(addonWhereClause = "is_valid=1 and parent_org_id IS NULL")
+    @AdvanceSelect(addonWhereClause = "is_valid=1")
     List<JSONObject> listAllOrgs();
 
     JSONObject findOrgByBDId(@Param("bd_id") int bd_id);
diff --git a/src/main/ui/static/config/managers/manager.js b/src/main/ui/static/config/managers/manager.js
index b749ab7a8..adf9fee30 100644
--- a/src/main/ui/static/config/managers/manager.js
+++ b/src/main/ui/static/config/managers/manager.js
@@ -20,9 +20,9 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
         };
         if($filter('withRole')('1')){
             $scope.listOrgs = function () {
-                $http.get('/sys/orgs',{params:{detail:true}}).then(function (resp) {
+                $http.get('/sys/orgs/list_all_Org', {params: {}}).then(function (resp) {
                     $scope.orgs = resp.data;
-                })
+                });
             };
             $scope.listOrgs();
         }
diff --git a/src/main/ui/static/config/managers/templates/managers.html b/src/main/ui/static/config/managers/templates/managers.html
index 688282066..36fa9f08d 100644
--- a/src/main/ui/static/config/managers/templates/managers.html
+++ b/src/main/ui/static/config/managers/templates/managers.html
@@ -36,11 +36,17 @@
                             </select>
                         </div>
                         <div class="form-group" ng-if="'1'|withRole">
+                            <select id="org-select" class="form-control" ng-model="search.org_id"
+                                    ng-options="org.org_id as org.name group by org.org_type for org in orgs">
+                                <option value="">All Organizations</option>
+                            </select>
+                        </div>
+                        <!--<div class="form-group" ng-if="'1'|withRole">
                             <label class="control-label" for="org-select">Organizations</label>
                             <select class="form-control" id="org-select" ng-model="search.org_id" ng-options="o.org_id as o.name for o in orgs">
                                 <option value="">All</option>
                             </select>
-                        </div>
+                        </div>-->
                     </form>
                     <div class="navbar-form navbar-right">
                         <button class="btn btn-success" type="button" ng-click="newManager()">
diff --git a/src/main/ui/static/config/organizations/templates/orgs.html b/src/main/ui/static/config/organizations/templates/orgs.html
index e614bb18e..d71f939a3 100644
--- a/src/main/ui/static/config/organizations/templates/orgs.html
+++ b/src/main/ui/static/config/organizations/templates/orgs.html
@@ -100,7 +100,7 @@
                                             <select id="org-select" class="form-control" ng-model="params.org_id"
                                                     ng-options="org.org_id as org.name group by org.org_type for org in orgs"
                                                     ng-change="listOrgs();">
-                                                <option value="">Organizations</option>
+                                                <option value="">All Organizations</option>
                                             </select>
                                     </div>
                                     <div class="col-xs-4 col-sm-6">
diff --git a/src/main/ui/static/payment/partner/templates/partners.html b/src/main/ui/static/payment/partner/templates/partners.html
index f23122fdb..aa99dceb1 100644
--- a/src/main/ui/static/payment/partner/templates/partners.html
+++ b/src/main/ui/static/payment/partner/templates/partners.html
@@ -148,8 +148,8 @@
                                             </div>
                                         </div>
 
-                                        <div class="form-group col-sm-6" ng-if="(params.org_id) || (currentUser.org_id && !currentUser.parent_org_id) ">
-                                            <label class="control-label col-xs-4 col-sm-4" for="org-clild" ng-if="!currentUser.org_id">Org Child</label>
+                                        <div class="form-group col-sm-6" ng-if="(params.org_id && orgs_child.length>1) || (currentUser.org_id && !currentUser.parent_org_id)">
+                                            <label class="control-label col-xs-4 col-sm-4" for="org-clild" ng-if="!currentUser.org_id">Sub Organization</label>
                                             <label class="control-label col-xs-4 col-sm-4" for="org-clild" ng-if="currentUser.org_id">Organization</label>
                                             <div class="col-xs-6 col-sm-6">
                                                 <select id="org-clild" class="form-control" ng-model="params.org_ids"