more breadcrumbs fixes