Added support for non-multiple selects