Added email query to client functionality