Support broken-up queries