Fix breadcrumb generation in all cases