add email address before filter
rename email address before filter
Merge branch 'refactoring'