Add harvest-id to base-fields