track entity_mappings on the entity
fix task run collection bug