modify CQExpression.scala