Add form validation and filtering