Added client.
Fixed Retriever query.