improve the language selection (to be completed)