changed query api to be based more on uri