PLA-1305 fix for url quoting