DPC-208 - fixes to API token getting url decoded