urlDecode added and tested