Use the field_name instead of custom_field_id in the unique 4-tuple key - non-custom fields do not have IDs, so the generated key is not unique and only the last-processed non-custom field per survey will be stored
Bumped release candidate