Removed code duplicate & uneeded URIEncode