Added email column

And fixed query.