Revise E2 form validation patterns