doc+run: add more queries