Better handling of column ordering