More enhancements to URL.