Improve support for multiple select elements