Continuation of: Product Category pages have lost their titles

Hi, I read the thread: Product Category pages have lost their titles and it helped me very much, thank you! As that thread is Resolved I start a new one.

How do I modify the code to work for product-tag and also for the attribute archives. Apparently the taxonomy code part does not do it.
This is an example of a product attribute page that worked before: https://asamaria.se/adelsten/ametist/
and this is a product-tag page that worked before:
https://asamaria.se/produkt-tagg/guld/

Reason for me using it is that I have moved the native one below the the products and use Genesis above. I think it is an awesome way to add content to a shop archive but now I start to question if there is a better way to do this….

Thanks in advance!

kr,

?sa

The page I need help with: [log in to see the link]