Issue #2894914 by gg24, ls206, geovanni.conti, faline: End date overridden if using field/token end date