Handle user's updates to date field in more cases