Fix support for multi-select fields when using a datasource

Resolve #152.