[#1833] Replace ; with & only in the QueryString and not the whole URI
[#1833] Add testcase for fix