Improved the way the URLs for searching are handled.