Improved selection based on language choices