Added checkbox and select options back in.