diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/config-editor.xml b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/config-editor.xml
index c95558171d7..bb6779f7040 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/config-editor.xml
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/config-editor.xml
@@ -56,7 +56,8 @@
     <!--    <for name="mco:otherConstraints" use="textarea"/>-->
     <for name="mco:otherConstraints" use="data-gn-keyword-picker">
       <directiveAttributes data-thesaurus-key="external.theme.access_use_conditions"
-                           data-thesaurus-concept-id-attribute="xlinkCOLONhref"/>
+                           data-thesaurus-concept-id-attribute="xlinkCOLONhref"
+                           data-show-hints-on-focus="true"/>
     </for>
     <for name="mri:statement" use="textarea"/>
     <for name="mri:supplementalInformation" use="textarea"/>
@@ -109,14 +110,16 @@
          use="data-gn-keyword-picker">
       <directiveAttributes data-thesaurus-key="external.theme.httpregistrymetawalcodelistmediatypes-media-types"
                            data-number-of-suggestions="200"
-                           data-thesaurus-concept-id-attribute="xlinkCOLONhref"/>
+                           data-thesaurus-concept-id-attribute="xlinkCOLONhref"
+                           data-show-hints-on-focus="true"/>
     </for>
 
     <for name="cit:title"
          xpath="/mdb:MD_Metadata/mdb:dataQualityInfo/mdq:DQ_DataQuality/mdq:report/mdq:DQ_DomainConsistency/mdq:result/mdq:DQ_ConformanceResult/mdq:specification/cit:CI_Citation/cit:title"
          use="data-gn-keyword-picker">
       <directiveAttributes data-thesaurus-key="external.theme.inspire-technical-guidelines"
-                           data-thesaurus-concept-id-attribute="xlinkCOLONhref"/>
+                           data-thesaurus-concept-id-attribute="xlinkCOLONhref"
+                           data-show-hints-on-focus="true"/>
     </for>
 
     <for name="mdb:contact" addDirective="data-gn-directory-entry-selector">
diff --git a/web-ui/src/main/resources/catalog/components/thesaurus/ThesaurusDirective.js b/web-ui/src/main/resources/catalog/components/thesaurus/ThesaurusDirective.js
index c70b6f9f559..203b3b546ed 100644
--- a/web-ui/src/main/resources/catalog/components/thesaurus/ThesaurusDirective.js
+++ b/web-ui/src/main/resources/catalog/components/thesaurus/ThesaurusDirective.js
@@ -866,7 +866,7 @@
                 var conceptIdElement = angular.element(
                   '<div class="well well-sm gn-keyword-picker-concept-id row">' +
                     '  <div class="form-group">' +
-                    '    <label class="col-sm-4"><i class="fa fa-link fa-fw"/><span data-translate>URL</span></label>' +
+                    '    <label class="col-sm-4"><i class="fa fa-link fa-fw"></i><span data-translate>URL</span></label>' +
                     '    <div class="col-sm-6"><input ' +
                     inputPropertyName +
                     '="' +