Added code to use select and multi-select