Re-ordered cols in selection, fixed minor bug