Better management of sort-by-likelihood