Fixing problem with not respecting locale in url generation