Change the select box as well as the hidden field

Also be consistent with quote marks