Refactored stock emails with consistent filters mirroring other email classes

Closes #6580