Router's url generation fixes