Fixed issue with the name not being returned through a work around
Fixed the breadcrumbs navigation issue