PERF: perf enhancements in indexing/query/eval