Fixed Client.m search criteria