Corrected problem when a querystring contains characters that Cocoon's escaping does not escape but which XPath's encode-for-uri does. Fixes WS-86.