Fix issue with some $pbiorigin variables having special chars in
the name causing the URL string to be incorrect