LPS-47117

Hey Hugo,

So my last fix stopped working (QA sent me an email about it) so I created this fix and it is working on the current Master head. Basically, it is now crafting URLs like the rest of the portal instead of just appending to a string. I included all of the same information it had previously as well. Let me know if you have any questions.

Thanks.