update for query api changes
5 files changed