Added support for form:select