updated queries to use run* when possible