Small changes for entity report