HCSVLAB-729 Improve URL encoding