Yet another fix for URL processing - do not escape what is already escaped :)