improve SQL Eval support