Fix regression on fields-of-interest as much as possible.