Added support for chosen select fields