few fixes for selects