Comment on End date overridden if using field/token end date