replaced all calls to makeUrlMatcher with calls to the UrlMatcher constructor