Fix sorting to use underscored column name
Fix icon button cell