Queries are upgraded