Fix expression when set
Fix null datetime