add better checking for multi-select