fixed issues with ObjectId and OrganizationService