Support for queries and other assorted changes