I have based this condition according to the other related to the date field (just above this change). Should I change them too?