[TASK] Avoid double url encoding

Fixes #693.