reimplement Query#expect #2