2nd pass at fixing reset of fields in image editor (#188)