multi select + cosmetic changes