Fixed return URL bug - url encoding was happening in Javascript and Groovy