Removed all the escape stuff

Now using URLEncoder.escape
Updated Version