Re #1400 Connecting all potential fields to contextual entities.