For #26190 - Finding matching publishes now uses entity, name, type.
Also addressed code review feedback