Added url decoding support