Hi @jetisco4u
The key concept with the organisation unit hierarchy dimension is that it should represent a geographical hierarchy. When you start trying to mix administrative hierarchies inside, problems arise. I think your last suggestion, to use a shared level for facilities/communities makes a lot of sense. Using orgunit group sets, you can then determine which type of “entity” is a facility or community organisation unit.
Its very important that all organisation units at level 5 (Entity) be a member of exactly one organisation unit group within the group set for Facility/Community. Organisation unit group sets should generally be compulsory (all organisation units should belong to the group set) and exclusive (organisation unit should only belong to one group within a group set).
Best regards,
Jason