[#76923746] Added sort functionality