uri - url encoding

fixed some discrepancies about URL encoding and URI encoding