Small fixes on breadcrumb