Some small refactoring
Fixes broken breadcrumb