Issue #2218933 follow-up: block event until ajax completes
Issue #2220497: Check preselected options against valid option sets