fixed email issue and changed clustered annotation behavior