Include tags in the catalog

[#58276980]