Fix regression in CSV export.
Fix formatting for column selector.
Fix column markup to reflect 'column' directive changes.