select > option, pt.2
More improvements