Bugfix/3267 breadcrumbs work packages

Meets #3267 breadcrumbs work packages