As the interface of the Query changed to require the ClientList, not the
Client directly.

Also, fixed few bugs from previous commit which were showed in the
tests.