Sort of picks must be done by the Manager, otherwise indexes are messed up.

Little code simplification on the Project.