Updated to new Query engine.