Update so that forms have correct IDs