fixes on UrlHelper