added support for hidden fields