encodeURI() added - code cleaned