DSQL changes to support expressions as strings. Still not working for unquoted expressions.