Fix form to account for empty fields