@russellholt @jdorweiler for single-item results, can we move the definition of `record_keys` alongside the definition of `record_data`?