Fix breadcrumbs in new structure