diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/index-fields/default.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/index-fields/default.xsl
index 0ceaa63d98a..0aae24ae21e 100644
--- a/schemas/dublin-core/src/main/plugin/dublin-core/index-fields/default.xsl
+++ b/schemas/dublin-core/src/main/plugin/dublin-core/index-fields/default.xsl
@@ -181,6 +181,26 @@
         <xsl:with-param name="store" select="'true'"/>
       </xsl:apply-templates>
 
+      <xsl:variable name="listOfKeywords">{
+        <xsl:variable name="keywordWithNoThesaurus"
+                      select="/simpledc/dc:subject[text() != '']"/>
+        <xsl:if test="count($keywordWithNoThesaurus) > 0">
+          'keywords': [
+          <xsl:for-each select="$keywordWithNoThesaurus">
+            <xsl:value-of select="concat('''', replace(., '''', '\\'''), '''')"/>
+            <xsl:if test="position() != last()">,</xsl:if>
+          </xsl:for-each>
+          ]
+        </xsl:if>
+        }
+      </xsl:variable>
+
+      <Field name="keywordGroup"
+             string="{normalize-space($listOfKeywords)}"
+             store="true"
+             index="false"/>
+
+
       <xsl:for-each select="/simpledc/dct:isPartOf">
         <Field name="parentUuid" string="{string(.)}" store="true" index="true"/>
       </xsl:for-each>
diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/layout/dispatcher.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/layout/dispatcher.xsl
index ad7ede6bb2b..f5cc65d269f 100644
--- a/schemas/dublin-core/src/main/plugin/dublin-core/layout/dispatcher.xsl
+++ b/schemas/dublin-core/src/main/plugin/dublin-core/layout/dispatcher.xsl
@@ -44,6 +44,7 @@
   <!-- Dispatching to the profile mode  -->
   <xsl:template name="dispatch-dublin-core">
     <xsl:param name="base" as="node()"/>
+
     <xsl:apply-templates mode="mode-dublin-core" select="$base"/>
   </xsl:template>
 
diff --git a/schemas/iso19139/src/main/plugin/iso19139/index-fields/default.xsl b/schemas/iso19139/src/main/plugin/iso19139/index-fields/default.xsl
index 331fb14a4f8..9bafe5e971c 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/index-fields/default.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/index-fields/default.xsl
@@ -398,6 +398,38 @@
         </xsl:for-each>
       </xsl:for-each>
 
+      <xsl:variable name="listOfKeywords">{
+        <xsl:variable name="keywordWithNoThesaurus"
+                      select="//gmd:MD_Keywords[
+                                not(gmd:thesaurusName) or gmd:thesaurusName/*/gmd:title/*/text() = '']/
+                                  gmd:keyword[*/text() != '']"/>
+        <xsl:if test="count($keywordWithNoThesaurus) > 0">
+          'keywords': [
+          <xsl:for-each select="$keywordWithNoThesaurus/(gco:CharacterString|gmx:Anchor)">
+            <xsl:value-of select="concat('''', replace(., '''', '\\'''), '''')"/>
+            <xsl:if test="position() != last()">,</xsl:if>
+          </xsl:for-each>
+          ]
+          <xsl:if test="//gmd:MD_Keywords[gmd:thesaurusName]">,</xsl:if>
+        </xsl:if>
+        <xsl:for-each-group select="//gmd:MD_Keywords[gmd:thesaurusName/*/gmd:title/*/text() != '']"
+                            group-by="gmd:thesaurusName/*/gmd:title/*/text()">
+          '<xsl:value-of select="replace(current-grouping-key(), '''', '\\''')"/>' :[
+          <xsl:for-each select="gmd:keyword/(gco:CharacterString|gmx:Anchor)">
+            <xsl:value-of select="concat('''', replace(., '''', '\\'''), '''')"/>
+            <xsl:if test="position() != last()">,</xsl:if>
+          </xsl:for-each>
+          ]
+          <xsl:if test="position() != last()">,</xsl:if>
+        </xsl:for-each-group>
+        }
+      </xsl:variable>
+
+      <Field name="keywordGroup"
+             string="{normalize-space($listOfKeywords)}"
+             store="true"
+             index="false"/>
+
       <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
       <xsl:apply-templates mode="index-contact"
diff --git a/schemas/iso19139/src/main/plugin/iso19139/index-fields/language-default.xsl b/schemas/iso19139/src/main/plugin/iso19139/index-fields/language-default.xsl
index ce0372da19d..7bd5c425a73 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/index-fields/language-default.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/index-fields/language-default.xsl
@@ -255,6 +255,43 @@
         </xsl:for-each>
       </xsl:for-each>
 
+
+      <xsl:if test="count(//gmd:keyword//gmd:LocalisedCharacterString[@locale = $langId and text() != '']) > 0">
+        <xsl:variable name="listOfKeywords">{
+          <xsl:variable name="keywordWithNoThesaurus"
+                        select="//gmd:MD_Keywords[
+                                  not(gmd:thesaurusName) or gmd:thesaurusName/*/gmd:title/*/text() = '']/
+                                    gmd:keyword//gmd:LocalisedCharacterString[@locale=$langId][*/text() != '']"/>
+          <xsl:if test="count($keywordWithNoThesaurus) > 0">
+            'keywords': [
+            <xsl:for-each select="$keywordWithNoThesaurus/(gco:CharacterString|gmx:Anchor)">
+              <xsl:value-of select="concat('''', replace(., '''', '\\'''), '''')"/>
+              <xsl:if test="position() != last()">,</xsl:if>
+            </xsl:for-each>
+            ]
+            <xsl:if test="//gmd:MD_Keywords[gmd:thesaurusName]">,</xsl:if>
+          </xsl:if>
+          <xsl:for-each-group select="//gmd:MD_Keywords[
+                                        gmd:thesaurusName/*/gmd:title/*/text() != '' and
+                                        count(gmd:keyword//gmd:LocalisedCharacterString[@locale = $langId and text() != '']) > 0]"
+                              group-by="gmd:thesaurusName/*/gmd:title/*/text()">
+
+            '<xsl:value-of select="replace(current-grouping-key(), '''', '\\''')"/>' :[
+            <xsl:for-each select="gmd:keyword//gmd:LocalisedCharacterString[@locale = $langId and text() != '']">
+              <xsl:value-of select="concat('''', replace(., '''', '\\'''), '''')"/>
+              <xsl:if test="position() != last()">,</xsl:if>
+            </xsl:for-each>
+            ]
+            <xsl:if test="position() != last()">,</xsl:if>
+          </xsl:for-each-group>
+          }
+        </xsl:variable>
+
+        <Field name="keywordGroup"
+               string="{normalize-space($listOfKeywords)}"
+               store="true"
+               index="false"/>
+      </xsl:if>
       <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
       <xsl:for-each
diff --git a/web-ui/src/main/resources/catalog/components/catalog/CatalogService.js b/web-ui/src/main/resources/catalog/components/catalog/CatalogService.js
index 63ba5de3472..c89e2361835 100644
--- a/web-ui/src/main/resources/catalog/components/catalog/CatalogService.js
+++ b/web-ui/src/main/resources/catalog/components/catalog/CatalogService.js
@@ -462,6 +462,7 @@
         'denominator', 'resolution', 'geoDesc', 'geoBox', 'inspirethemewithac',
         'status', 'status_text', 'crs', 'identifier', 'responsibleParty',
         'mdLanguage', 'datasetLang', 'type', 'link'];
+      var listOfJsonFields = ['keywordGroup'];
       var record = this;
       this.linksCache = [];
       $.each(listOfArrayFields, function(idx) {
@@ -471,6 +472,14 @@
           record[field] = [record[field]];
         }
       });
+      $.each(listOfJsonFields, function(idx) {
+        var field = listOfJsonFields[idx];
+        if (angular.isDefined(record[field])) {
+          try {
+          record[field] = angular.fromJson(record[field]);
+          } catch (e) {}
+        }
+      });
 
       // Create a structure that reflects the transferOption/onlinesrc tree
       var links = [];
diff --git a/web-ui/src/main/resources/catalog/locales/en-core.json b/web-ui/src/main/resources/catalog/locales/en-core.json
index 2082b90f889..5cfc3a216d5 100644
--- a/web-ui/src/main/resources/catalog/locales/en-core.json
+++ b/web-ui/src/main/resources/catalog/locales/en-core.json
@@ -44,6 +44,7 @@
     "anyPlaceHolder": "Search ...",
     "VALID": "Valid",
     "INVALID": "Invalid",
+    "clickToFilterOn": "Click to filter on ",
     "NEVER_CALCULATED": "Never validated",
     "validStatus-1": "Valid",
     "validStatus-0": "Invalid",
diff --git a/web-ui/src/main/resources/catalog/views/default/templates/recordView.html b/web-ui/src/main/resources/catalog/views/default/templates/recordView.html
index 164e4383908..72dc9331194 100644
--- a/web-ui/src/main/resources/catalog/views/default/templates/recordView.html
+++ b/web-ui/src/main/resources/catalog/views/default/templates/recordView.html
@@ -65,7 +65,7 @@
 
       <i class="fa fa-times"></i>
     </a>
-    
+
     <a class="btn btn-primary gn-md-edit-btn pull-right"
        data-ng-show="user.canEditRecord(mdView.current.record)"
        data-ng-href="catalog.edit#/metadata/{{mdView.current.record.getId()}}"
@@ -74,7 +74,7 @@
     </a>
 
     <div class="gnMdfeedback"></div>
-  
+
     <div data-ng-show="usingFormatter"
          id="gn-metadata-display"
          class="gn-metadata-display">
@@ -129,7 +129,7 @@ <h2 data-translate="">aboutThisResource</h2>
               <div data-ng-repeat="cat in mdView.current.record.inspirethemewithac"
                    data-ng-click="search({'inspirethemewithac': cat})"
                    class="iti-box full {{cat.split('|')[0]}} {{cat.split('|')[0]}}-{{langs[lang]}}"
-                   title="{{cat.split('|')[1]}}">
+                   title="{{'clickToFilterOn' | translate}} {{cat.split('|')[1]}} ...">
                 <div class="icon"><span class="iti-{{cat.split('|')[0]}}"></span></div>
                 <p class="label"></p>
               </div>
@@ -142,7 +142,7 @@ <h2 data-translate="">aboutThisResource</h2>
               <div data-ng-repeat="cat in mdView.current.record.category"
                    data-ng-click="search({'_cat': cat})"
                    class="iti-box full gn-iti"
-                   title="{{('cat-' + cat) | translate}}">
+                   title="{{'clickToFilterOn' | translate}} {{('cat-' + cat) | translate}} ...">
                 <div class="icon">
                   <span class="fa gn-icon-{{cat}}"></span></div>
                 <p class="label">{{('cat-' + cat) | translate}}</p>
@@ -151,7 +151,7 @@ <h2 data-translate="">aboutThisResource</h2>
               <div data-ng-repeat="cat in mdView.current.record.topicCat track by $index"
                    data-ng-click="search({'topicCat': cat})"
                    class="iti-box full gn-iti"
-                   title="{{cat | translate}}">
+                   title="{{'clickToFilterOn' | translate}} {{cat | translate}} ...">
                 <div class="icon">
                   <span class="fa gn-icon-{{cat}}"></span>
                 </div>
@@ -159,16 +159,14 @@ <h2 data-translate="">aboutThisResource</h2>
               </div>
             </td>
           </tr>
-          <tr data-ng-if="mdView.current.record.keyword">
-            <th data-translate="">keywords</th>
+          <tr data-ng-repeat="(thesaurus, keywords) in mdView.current.record.keywordGroup">
+            <th>{{thesaurus | translate}}</th>
             <td>
-
               <ul>
-                <li data-ng-repeat="k in mdView.current.record.keyword track by $index">
-                  {{k}}
-                </li>
+                <li data-ng-repeat="k in keywords track by $index"
+                    title="{{'clickToFilterOn' | translate}} {{k}} ..."
+                    data-ng-click="search({'keyword': k})">{{k}}</li>
               </ul>
-              <!--<span class="badge" data-ng-repeat="k in mdView.current.record.keyword track by $index">{{k}}</span>-->
             </td>
           </tr>
           <tr data-ng-if="mdView.current.record.datasetLang">
diff --git a/web/src/main/webapp/WEB-INF/config-lucene.xml b/web/src/main/webapp/WEB-INF/config-lucene.xml
index f93241b8dfb..7b399e463e0 100644
--- a/web/src/main/webapp/WEB-INF/config-lucene.xml
+++ b/web/src/main/webapp/WEB-INF/config-lucene.xml
@@ -140,6 +140,7 @@
       <field name="publicationDate" tagName="publicationDate"/>
       <field name="abstract" tagName="abstract" multilingualSortField="true"/>
       <field name="keyword" tagName="keyword"/>
+      <field name="keywordGroup" tagName="keywordGroup"/>
       <field name="parentUuid" tagName="parentId"/>
       <field name="type" tagName="type"/>
       <field name="identifier" tagName="identifier"/>
diff --git a/web/src/main/webapp/xslt/ui-metadata/form-builder.xsl b/web/src/main/webapp/xslt/ui-metadata/form-builder.xsl
index 9e5bbffb4da..31f19cae32f 100644
--- a/web/src/main/webapp/xslt/ui-metadata/form-builder.xsl
+++ b/web/src/main/webapp/xslt/ui-metadata/form-builder.xsl
@@ -140,6 +140,7 @@
         </div>
       </xsl:when>
       <xsl:otherwise>
+
         <div
           class="form-group gn-field gn-{substring-after(name(), ':')} {if ($isRequired) then 'gn-required' else ''} {if ($isFirst) then '' else 'gn-extra-field'}"
           id="gn-el-{$editInfo/@ref}"