Sort the items before saving to avoid randomness in the diffs...
Fixes to item selection...