diff --git a/docs/_templates/product-v2.rst b/docs/_templates/product-v2.rst
index 8e76d1b51..caa22fdcc 100644
--- a/docs/_templates/product-v2.rst
+++ b/docs/_templates/product-v2.rst
@@ -551,7 +551,7 @@
            -
          {%- endif %}
          {%- endif %}
-         {%- if tags_list and enable_tags %}
+         {%- if tags_list %}
          * - **Tags**
            - {{ tags_list | join(", ") }}
            -
@@ -587,7 +587,7 @@
         - Aliases
         - Resolution
         - CRS
-        - Nodata
+        - 'No data'
         - Units
         - Type
         - Description