[WIP-348] reorder column