update forms with correct type & some validation