Changed criteria to use tid instead of email