Renumber fields and tags