=== modified file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityController.java' --- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityController.java 2013-11-19 20:03:19 +0000 +++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityController.java 2013-11-19 20:19:30 +0000 @@ -394,7 +394,8 @@ for ( String parent : parentList ) { - if ( organisationUnit.getParent() != null && organisationUnit.getParent().getUid().equals( parent ) ) + if ( organisationUnit.getParent() != null && + (organisationUnit.getParent().getUid().equals( parent ) || organisationUnit.getParent().getUuid().equals( parent )) ) { shouldRemove = false; break;