ACTN-172 - jin - adding encoding for url