Fixed unexpected re-ordering of non-sort columns