Since we no longer rely on an arbitrary 'score' (which wasn't ideally calculated), we now have a stable item order which also improves the handling of some edge-cases.