Fix "AND" query