adding org_unit retrieve checks