[TASK] Avoid double url encoding