Fixed custom UrlMatcher issues