Improve custom selects