Add support for query parameters with the forms
wip