[UrlMapper]: Apply some small changes