Sorting & quality label fix