Enable tired sort for items that aren't displayed
Merge branch 'tiered-sort' into staging2