Only parse out values from data criteria if it has a value and isn't a characteristic
Merge branch 'viz_char_value', fixes #380