Feature 83: Implement bug fix for completed cohort showing calendar beyond w8d5