Add EmptyDate and clean EntityForm