Revert "Revert "Fill MP select after load""
Revert "Revert "Fill MP select after load""

This reverts commit 69c35fa7bc960e7491c90e5e015f753e8fbea2c6.

OpenUpSA/contact-mps,OpenUpSA/contact-mps,OpenUpSA/contact-mps,OpenUpSA/contact-mps