[task] fixes for new query api