Merge "fix a bug that extra is not actually set to the query." into sc-qpr1-dev