Fixed AM-20 sorting and waiting time updating