keyword upgrades: sort them, refs #518