More fixes for breadcrumb