Minor changes regarding the hidden form type and form type option disabled