Refactored last pr

Author: ihorvansach

Block/Index.php

@@ -70,6 +70,12 @@ protected function _prepareLayout()
 
         $this->addBreadcrumbs();
 
+        $this->pageConfig->addRemotePageAsset(
+            $this->getUrl('htmlsitemap'),
+            'canonical',
+            ['attributes' => ['rel' => 'canonical']]
+        );
+
         $title = $this->config->getConfig(self::XML_PATH_TO_PAGE_TITLE) ?: '';
         $metaTitle = $this->config->getConfig(self::XML_PATH_TO_PAGE_META_TITLE) ?: '';
         $metaDescription = $this->config->getConfig(self::XML_PATH_TO_PAGE_META_DESCRIPTION) ?: '';

Block/Type/Block.php

@@ -90,8 +90,8 @@ protected function addBreadcrumbs()
             $breadcrumbsBlock->addCrumb(
                 'htmlsitemap_' . $this->type,
                 [
-                    'label' => __(ucfirst($this->type)),
-                    'title' => __(ucfirst($this->type)),
+                    'label' => __(ucfirst($this->getBlockTitle())),
+                    'title' => __(ucfirst($this->getBlockTitle())),
                 ]
             );