Fix routing to handle multi-lingual