Extended the URL filter to escape more invalid characters
Synced from master
Synced from master