@umpirsky I think @pjedrzejewski is referring to this line. Should we order by `o.number` instead?