Updating with new `with_queries` option