[task] added minimal new query api
[task] replaced old with new query api