Added support QValue and fixed OrExpression