wip-149: Applied reviewer's comments - merged ColumnSelection hierarchy into ColumnRef