Better logic for missing custom fields in impact section