Fixed EmailFilter. Fixed file uploads. Made code more readable.