I've found that anywhere there is a form asking for the Unit the list is populated by all Units rather than what (I think) it should be... only the items for the select Unit Group.
So is the proper way to "fix" this to go into each form using Unit and limit it's items based on it's parent?