fix column reordering with added/deleted columns