fix for external_id field