Improved handling of column headers