Improve URL matcher