refactor Organization select