Updated email volunteer filter and base dir