Better handling of customized choices