updated CPIM, gae-client, updated query test