Fix Manual Query.

Change-Id: I8294900ee0db28f8ebce56184b186c5e407fba4c