Tested and re-implemented double encoded URL fix