CollectionPage headline

Thanks for this plugin. Really love it. There is only one issue I saw on the CollectionPage, headline for tags and categories. It always adds the word “Tag” or “Category” at the end of my tag name, resp. category name. For example the headline looks like “Carparts Category”, when it only should be Carparts, or it looks like “2019 Tag” when it only should be 2019