Fix D7 issues, change to run for flagged BDA members rather than by role