CLC-3682 encodeUriComponent to prevent recurrence of CLC-3047