update for query api changes