Added org select control
remove boilerplate codes.