Adjustments to breadcrumbs and fix to moving CICs