diff --git a/docs/_templates/product-v2.rst b/docs/_templates/product-v2.rst
index 6d663e87e..0d98823e0 100644
--- a/docs/_templates/product-v2.rst
+++ b/docs/_templates/product-v2.rst
@@ -107,7 +107,7 @@
 {# Tags list component #}
 
 {% set tags_list_component -%}
-{% for tag in tags_list %}`#{{tag}} </search/?q=%23{{tag}}>`_{% if not loop.last %}, {% endif %}{% endfor %}
+{% for tag in tags_list %}`{{tag}} </search/?q=Tag+{{tag}}>`_{% if not loop.last %}, {% endif %}{% endfor %}
 {%- endset %}
 
 {# Restructured Text head component #}