Some fixes for multi-select data type