Add more queries for printing on Web