Fix email address
Add tags