Update to new query dispatcher API