Fixed issues in caregiver plan