Fixed sorting in main list