Logic fix for having an end date set, line break in the template