get rid of this service and just augment the query api