Added filter to Email progress and some other tweaks