Fix form selection and validation