Resolver: Handle double URL encoding, refs #1252