Added uri decoding.