A few query changes.