Fix validation issue.
Fix returning only the key value, when the header + key should be
passed.