Fix sample queries for the `diagrams` tool