Correctly handle non-multivalued select value