Sorting issue fix for last 30