Fix up breadcrumbs, more robust and better nao.