Upgrade to v12 Query