Breadcrumbs optimization

See commits description for more info.