added support for select field