Fixed problems with UrlGenerator