ensure CV choices are correctly saved in customizer, as per ticket #7