Improvements to language selection