Improvements to module_urlsafety