Added logic to fully qualify column headers