Fix problems with heading output
Move heading columns