Added more multi select logic