Pss email problems [PD-820][PD-818]

This should be done now, but it probably needs a really good check because it's easy to miss edge cases and I'm not super familiar with saved searches in the first place.

All tests pass.