fixes to allow setting org instead of group