cleaned up org selection