Fixed sorting in workshop model