added checkbox and select support