Fixed double-encoding of URI by decoding it first