Continue migrating old query api to new query api
Api based data source bug fixes