Improve breadcrumbs creation