another fix to url/email escaping