Error passing paramaters to forms api

[DanMakeway]

I'm following up on a different thread which didn't get a response.
The issue I'm now having is. the Error and declined pages are throwing an error, because they are also expecting the ID?=XXX paramater. is there a way to have those passed back from the form? Currently I've updated the links to be :
<input type="hidden" name="OnSuccessUrl" id="OnSuccessUrl" value="https://makewaygifts.secure.force.com/donate/thanks?id={!dq.id}" />
<input type="hidden" name="OnDeclineUrl" id="OnDeclineUrl" value="https://makewaygifts.secure.force.com/donate/declined?id={!dq.id}" />
<input type="hidden" name="OnErrorUrl" id="OnErrorUrl" value="https://makewaygifts.secure.force.com/donate/error?id={!dq.id}" />

but on an error, it gets overwritten to:
/error?id=a3061000000lXOaAAM?err=Cardnumber%20is%20 invalid&hashresponse=ZGEzOWEzZWU1ZTZiNGJkMzI1NWJmZ WY5NTYwMTg5MGFmZDg3OQ==&RefID=web

The error is having two ? in the parameters.

this is the same issue as this post: Error Redirect fails when an existing ID in the redirect url - ClickandPledge.com Support Forum

I've enabled remote access:
Temporary Code
T1P3M8EAV0

---

Expires
27/01/2022 11:05 AM

[CnP.Support.AM]

Good day @DanMakeway

We are following up with you in the other thread.