Fixing related entities and participants to match