several fixes for getOrganizationInfo