Changed implementation to use value as field rather than label and value.