Fixed some errors with search/replace and URL's