Change to use date instead of CDbExpression