Upgrade query and consumer.