EST-398, EST-330:  Safeguard start and end date, fix removal of terms and items