Fixes for Tiers and sortables