Improvements to URL handling category.