Currently if startdate and enddate informed action expires based on startdate

Make it that if there's both dates then take end date