Adding query support in client along with test