Upgrade all queries to show-elements