Improved the original URL search