+ [OES-328] minor sorting tweaks