Sorting by extension improved (secondary sorting by file name)