WEBSPARK-356 - Multiple fixes to extras, breadcrumb