Had to add URL decoding for when addresses and an ampersand
Merge commit 'ee1761b21cfc2d545526f69c9b2e1bc3038a6cf9'