Updates for breadcrumb issue