[Tutti-commits] 71/98: fix queries