Multi-select (apply button), refactoring