disabled query engine enhancements