Sort update #2

Filtering/sorting by two columns seems to be working fine, too.