Fixes for sort-based facets.