Order queue by id
Release 1.5.8

Updated 4278
Updated 5729