Updated to latest version of the query engine