Improve locale selection