add optional rule to report entityid
added make support