swc-1297 - column reordering