GRAILS-9742 switched back to URLEncoder with special handling for + and %20