make fillForm and verifyForm more robust