updated with URLEncoder