Fix issue in routes, and CaregiverPlans class