[BUGFIX] Move hidden fields back into form tag