Improved form content generator for GET and HEAD requests

Having the form generator for GET (and HEAD) requests merge the form parameters into the URL query is much more DWIM.