Fix table column mismatch when fields can change