minor fixes for multiple selection