Updated attribute names to reflect XSD change
Decode the configured query param as well as the request query param
Removed plus sign replacement