Multi-language
Improvements to language URL handling