[#1833] Replace ; with & only in the QueryString and not the whole URI. Also add test-case