Improved handling of special inputs in Form