Better handling of empty option fields in app