Security definition enhancement.
Changes to model usage so report works on extended breadcrumb trail.