Rename or_by_entity to any_by_entity.