fix goal update form iteration