Small fixes in selects