fix sponsoring_org noop case, refactor SUH