Remove calls to deprecated URLEncoder.encode