Fix sorting of container list (see #10242)
Fix sorting for screen
Merge pull request #644 from jburel/list-sorting

Fix sorting of container list (see #10242)