Improvements on URL-escaping.