Fixed more breadcrumb issues