Added support for select field in form