Repair following fields number. Temporarily do not move the result to the Output folder
Some Polish work