diff --git a/src/collective/dms/thesaurus/browser/dmskeyword_view.pt b/src/collective/dms/thesaurus/browser/dmskeyword_view.pt
index 5976074..198cf2c 100644
--- a/src/collective/dms/thesaurus/browser/dmskeyword_view.pt
+++ b/src/collective/dms/thesaurus/browser/dmskeyword_view.pt
@@ -36,6 +36,20 @@
                                 ]</tal:equivs></p>
         <div tal:replace="structure provider:plone.belowcontenttitle" />
 
+        <dl class="portalMessage warning"
+            tal:define="widget python:view.widgets.get('scope_note')"
+            tal:condition="widget/value"
+        ><dt tal:content="widget/label"/><dd >
+          <span tal:replace="structure widget/render" />
+        </dd></dl>
+
+        <dl class="portalMessage info"
+            tal:define="widget python:view.widgets.get('historical_note')"
+            tal:condition="widget/value"
+        ><dt tal:content="widget/label"/><dd >
+          <span tal:replace="structure widget/render" />
+        </dd></dl>
+
         <tal:related define="widget python:view.widgets.get('related')">
           <div id="dmskeywords-navigation-related"
                class="field"
diff --git a/src/collective/dms/thesaurus/thesaurus-keyword-equivs-display.pt b/src/collective/dms/thesaurus/thesaurus-keyword-equivs-display.pt
index 4ee5e8b..8e029db 100644
--- a/src/collective/dms/thesaurus/thesaurus-keyword-equivs-display.pt
+++ b/src/collective/dms/thesaurus/thesaurus-keyword-equivs-display.pt
@@ -16,8 +16,5 @@
                       onkeydown view/onkeydown;
                       onkeyup view/onkeyup"><li
     tal:repeat="value view/terms"
-      ><span class=""
-             tal:content="value" />
-  </li
-></ul>
-<em tal:condition="not:view/terms">(nothing)</em>
+      ><span class="" tal:content="value" /></li></ul
+><em tal:condition="not:view/terms">(nothing)</em>