ToolForm: Improve validation