Added support for QuerySelectField and QuerySelectMultipleField