- Improve locale selection