#1218: Fixing multi-column sort

Fixing multi-sort by ensuring that sorting is reached...moved the sort code outside of the if/else