Fix breadcrumbs a bit more!