More fixes for parsing select options with stray commas, spaces, etc