Move logic into query module.
Add find method to client.