Match the current URL instead of trying to rebuild