Better option_with_value_or_label selector

Allow non string values