added multiselect; bug fix