Fix issues with routes and default language