Move escapeExpression into SelectParser