Enhanced markup of the queries. Added our emails