added support for multi select fields