update form handler to handle errors in repeated fields better