Further breadcrumbs improvements