WP-2351 Added update to enable select_or_other