added reporting of entityid