Updated to new service query api