#1789 | Support for multi select