3.0 matching fixes

Fixes #5463
missing $entity->source() for matching results