JEN-26: fix with URLEncoding