Some improvements for school selection

Initial PR