Some queries were still missing (#205)