Added select and checkbox questions