Improve language select