Updates to queries and utilities