now returning the entity name and value on match