[BUGFIX] Avoid double-encoding of URL parameters