Fixes #62 - more efficient annotation query for email invitations