Fixed OoBE in query()