Added URL encode/decoding