added new query engine support to invalidator