Cause mail-shots to use dynamic queries

Interim commit
[ci skip]