breadcrumb and block issue fixes