fix org selector bugs