diff --git a/web-ui/src/main/resources/catalog/components/admin/harvester/HarvesterDirective.js b/web-ui/src/main/resources/catalog/components/admin/harvester/HarvesterDirective.js
index 813831f77f7..1045573c452 100644
--- a/web-ui/src/main/resources/catalog/components/admin/harvester/HarvesterDirective.js
+++ b/web-ui/src/main/resources/catalog/components/admin/harvester/HarvesterDirective.js
@@ -270,15 +270,15 @@
   module.directive('gnHarvesterExtras',
       ['$http', '$translate', '$rootScope',
         function($http, $translate, $rootScope) {
-
           return {
             restrict: 'A',
             replace: false,
             templateUrl: '../../catalog/components/admin/harvester/partials/' +
                 'extras.html',
-
+            scope: {
+              harvester: '=gnHarvesterExtras'
+            },
             link: function(scope, element, attrs) {
-
               $http.get('../api/languages', {cache: true})
                   .success(function(data) {
                     scope.languages = data;
diff --git a/web-ui/src/main/resources/catalog/components/admin/harvester/partials/extras.html b/web-ui/src/main/resources/catalog/components/admin/harvester/partials/extras.html
index 9aa72b91e6e..bdf7d34bf18 100644
--- a/web-ui/src/main/resources/catalog/components/admin/harvester/partials/extras.html
+++ b/web-ui/src/main/resources/catalog/components/admin/harvester/partials/extras.html
@@ -1,6 +1,10 @@
-<div>
-  <div data-ng-show="harvester['@type'] == 'webdav' || harvester['@type'] == 'geonetwork' || harvester['@type'] == 'csw'
-    || harvester['@type'] == 'oaipmh' || harvester['@type'] == 'filesystem'">
+<fieldset>
+  <legend data-translate="">uuidMergePolicy</legend>
+  <div data-ng-show="harvester['@type'] == 'webdav'
+                     || harvester['@type'] == 'geonetwork'
+                     || harvester['@type'] == 'csw'
+                     || harvester['@type'] == 'oaipmh'
+                     || harvester['@type'] == 'filesystem'">
     <label class="control-label">
       <span data-translate="">{{"harvesterOverrideUUID" | translate}}</span>
     </label>
@@ -12,4 +16,4 @@
     </select>
     <span class="help-block ng-scope" data-translate="">harvesterOverrideUUIDHelp</span>
   </div>
-</div>
+</fieldset>
diff --git a/web-ui/src/main/resources/catalog/components/admin/harvester/partials/identification.html b/web-ui/src/main/resources/catalog/components/admin/harvester/partials/identification.html
index 773e73520d2..d94c2363449 100644
--- a/web-ui/src/main/resources/catalog/components/admin/harvester/partials/identification.html
+++ b/web-ui/src/main/resources/catalog/components/admin/harvester/partials/identification.html
@@ -1,5 +1,8 @@
 <fieldset>
-  <legend data-translate="">harvesterIdentification</legend>
+  <legend>
+    <i class="fa fa-fw fa-info-circle"></i>
+    <span data-translate="">harvesterIdentification</span>
+  </legend>
   <div id="gn-harvest-settings-selected-name-row"
        data-ng-class="
         $parent.harvesterForm.harvesterSiteName.$error.required ||
@@ -61,5 +64,4 @@
 
     <p class="help-block" data-translate="">harvesterUserHelp</p>
   </div>
-  <div data-gn-harvester-extras="">
 </fieldset>
diff --git a/web-ui/src/main/resources/catalog/components/admin/harvester/partials/privileges.html b/web-ui/src/main/resources/catalog/components/admin/harvester/partials/privileges.html
index 8ca24aadac0..a56a766bd6f 100644
--- a/web-ui/src/main/resources/catalog/components/admin/harvester/partials/privileges.html
+++ b/web-ui/src/main/resources/catalog/components/admin/harvester/partials/privileges.html
@@ -1,5 +1,8 @@
 <fieldset>
-  <legend id="gn-harvest-settings-gn-priviliges-title" data-translate="">harvestedRecordPrivileges</legend>
+  <legend id="gn-harvest-settings-gn-priviliges-title">
+    <i class="fa fa-fw fa-unlock"></i>
+    <span data-translate="">harvestedRecordPrivileges</span>
+  </legend>
 
 
   <div id="gn-harvest-settings-gn-priviliges-ifRecordExistAppendPrivileges"
diff --git a/web-ui/src/main/resources/catalog/components/admin/harvester/partials/schedule.html b/web-ui/src/main/resources/catalog/components/admin/harvester/partials/schedule.html
index 649159f9b66..66027f339a2 100644
--- a/web-ui/src/main/resources/catalog/components/admin/harvester/partials/schedule.html
+++ b/web-ui/src/main/resources/catalog/components/admin/harvester/partials/schedule.html
@@ -1,5 +1,6 @@
 <fieldset>
   <legend id="gn-harvest-settings-selected-schedule-title">
+    <i class="fa fa-fw fa-clock-o"></i>
     <span data-translate="">harvesterSchedule</span>
 
     <div id="gn-harvest-settings-selected-schedule-buttons" class="btn-group btn-group-sm pull-right gn-margin-bottom" data-toggle="buttons">
diff --git a/web-ui/src/main/resources/catalog/locales/en-admin.json b/web-ui/src/main/resources/catalog/locales/en-admin.json
index 078b469bd13..0653ef65183 100644
--- a/web-ui/src/main/resources/catalog/locales/en-admin.json
+++ b/web-ui/src/main/resources/catalog/locales/en-admin.json
@@ -469,7 +469,7 @@
     "harvester-webdavHelp": "Harvest from a remote WebDAV or WAF server",
     "harvester-wfsfeatures": "OGC WFS GetFeature",
     "harvester-wfsfeaturesHelp": "Create metadata records or directory entries from WFS features.",
-    "harvesterAdvancedConfigurationFor": "Advanced options for protocol ",
+    "harvesterResponseProcessing": "Configure response processing for ",
     "harvesterError": "Harvest error",
     "harvesterFilter": "Search filter",
     "harvesterGroup": "Group",
@@ -481,7 +481,7 @@
     "harvesterIconHelp": "Image describing the remote node.",
     "harvesterIdentification": "Identification",
     "harvesterIsRunning": "Harvester is running!",
-    "harvesterMainConfigurationFor": "Configuration for protocol ",
+    "harvesterConnectionConfiguration": "Configure connection to ",
     "harvesterName": "Node name",
     "harvesterNameHelp": "The name describing the remote node.",
     "harvesterOverrideUUID" : "Action on UUID collision",
diff --git a/web-ui/src/main/resources/catalog/locales/en-v4.json b/web-ui/src/main/resources/catalog/locales/en-v4.json
index 5f67e65ed4f..8ebd1d32be6 100644
--- a/web-ui/src/main/resources/catalog/locales/en-v4.json
+++ b/web-ui/src/main/resources/catalog/locales/en-v4.json
@@ -299,5 +299,8 @@
   "harvesterConfigIsNotJson": "The harvester config must be a JSON configuration.",
   "harvesterConfigIsNotValid": "The harvester config does not look to be a valid configuration.",
   "specificationConformance": "Specification conformance",
-  "toggleOptions": "Toggle filter options (open or close filter tree)"
+  "toggleOptions": "Toggle filter options (open or close filter tree)",
+  "uuidMergePolicy": "UUID merge policy",
+  "filteringAndProcessing": "Filtering and processing response",
+  "recordCreationOptions": "Record creation options"
 }
diff --git a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/arcsde.html b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/arcsde.html
index 3d35762e369..f38bdd5d69d 100644
--- a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/arcsde.html
+++ b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/arcsde.html
@@ -8,7 +8,7 @@
   </div>
 
   <fieldset id="gn-harvest-settings-sde-basic-row">
-    <legend id="gn-harvest-settings-sde-basic-title"><span data-translate="">harvesterMainConfigurationFor</span> {{('harvester-' +
+    <legend id="gn-harvest-settings-sde-basic-title"><i class="fa fa-fw fa-plug"></i><span data-translate="">harvesterConnectionConfiguration</span> {{('harvester-' +
       harvesterSelected['@type']) | translate}}
     </legend>
     <div id="gn-harvest-settings-sde-basic-server-row" data-ng-class="harvesterSelected.site.server == '' ? 'has-error' : ''">
@@ -67,7 +67,7 @@
   </fieldset>
 
   <fieldset id="gn-harvest-settings-sde-advanced-row">
-    <legend id="gn-harvest-settings-sde-advanced-title"><span data-translate="">harvesterAdvancedConfigurationFor</span>
+    <legend id="gn-harvest-settings-sde-advanced-title"><i class="fa fa-fw fa-cogs"></i><span data-translate="">harvesterResponseProcessing</span>
       {{harvesterSelected['@type'] | translate}}
     </legend>
 
diff --git a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/csw.html b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/csw.html
index a9d359ba68d..89a2a18aa14 100644
--- a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/csw.html
+++ b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/csw.html
@@ -9,10 +9,12 @@
 
 
   <fieldset id="gn-harvest-settings-csw-basic-row">
-    <legend id="gn-harvest-settings-csw-basic-title"><span data-translate="">harvesterMainConfigurationFor</span> {{('harvester-' +
+    <legend id="gn-harvest-settings-csw-basic-title">
+      <i class="fa fa-fw fa-plug"></i><span data-translate="">harvesterConnectionConfiguration</span> {{('harvester-' +
       harvesterSelected['@type']) | translate}}
     </legend>
-    <div id="gn-harvest-settings-csw-basic-service-row" data-ng-class="harvesterSelected.site.url == '' ? 'has-error' : ''">
+    <div id="gn-harvest-settings-csw-basic-service-row"
+         data-ng-class="harvesterSelected.site.url == '' ? 'has-error' : ''">
       <label id="gn-harvest-settings-csw-basic-service-label" class="control-label" data-translate="">serviceUrl</label>
       <input id="gn-harvest-settings-csw-basic-service-input"
              type="text"
@@ -21,6 +23,11 @@
       <p class="help-block" data-translate="">csw-capabilitiesUrlHelp</p>
     </div>
 
+
+    <div id="gn-harvest-settings-csw-advanced-authentication-row"
+         data-gn-harvester-account="harvesterSelected"/>
+
+
     <fieldset id="gn-harvest-settings-csw-basic-service-criteria-row" class="form-horizontal cswCriteriaInfo">
       <legend id="gn-harvest-settings-csw-basic-service-criteria-title" data-translate="">harvesterFilter</legend>
 
@@ -73,134 +80,140 @@
       </div>
     </fieldset>
 
+    <fieldset id="gn-harvest-settings-csw-basic-service-search-option-row"
+              class="form-horizontal cswCriteriaInfo">
+      <legend id="gn-harvest-settings-csw-basic-service-search-option-title" data-translate="">searchOptions</legend>
 
-    <hr/>
-    <div id="gn-harvest-settings-csw-xpath-filter-title-row">
-      <label id="gn-harvest-settings-csw-xpath-filter-title-label" class="control-label col-lg-4" data-translate="">xpathFilter</label>
-      <div class="col-lg-8">
-        <input id="gn-harvest-settings-csw-xpath-filter-title-input"
+      <div id="gn-harvest-settings-csw-advanced-sortBy-row">
+        <label id="gn-harvest-settings-csw-advanced-sortBy-label"
+               class="control-label"
+               data-translate="">sortBy</label>
+        <input id="gn-harvest-settings-csw-advanced-sortBy-input"
                type="text"
-               class="form-control"
-               data-ng-model="harvesterSelected.site.xpathFilter"/>
+               class="form-control gn-csw-criteria"
+               data-ng-model="harvesterSelected.site.sortBy"/>
+        <p class="help-block" data-translate="">csw-sortByHelp</p>
       </div>
-      <p class="help-block" data-translate="">xpathFilter-help</p>
-    </div>
 
+      <div id="gn-harvest-settings-csw-advanced-scheme-row">
+        <div class="row">
+          <div id="gn-harvest-settings-csw-advanced-scheme-output-row"
+               class="col-lg-8 col-md-8 col-sm-8 gn-nopadding-left gn-nopadding-right">
+            <label id="gn-harvest-settings-csw-advanced-scheme-output-label" class="control-label" data-translate="">csw-outputSchema</label>
+            <input id="gn-harvest-settings-csw-advanced-scheme-output-input" type="text" class="form-control gn-csw-criteria" id="csw-outputSchemaInput"
+                   data-ng-model="harvesterSelected.site.outputSchema"/>
+          </div>
+          <div id="gn-harvest-settings-csw-advanced-scheme-recommended-row"
+               class="col-lg-4 col-md-4 col-sm-4 hidden-xs gn-nopadding-right">
+            <label id="gn-harvest-settings-csw-advanced-scheme-recommended-label" class="control-label" data-translate="">csw-outputSchemaOptions</label>
+            <select id="gn-harvest-settings-csw-advanced-scheme-recommended-list"
+                    data-ng-model="harvesterSelected.site.outputSchema"
+                    class="form-control gn-csw-criteria"
+                    id="csw-outputSchemaOptionsSelect">
+              <option value="" disabled="" data-translate="">csw-recommendedValues</option>
+              <option value="http://www.opengis.net/cat/csw/2.0.2" data-translate="">csw-dublinCore</option>
+              <option value="http://www.isotc211.org/2005/gmd" data-translate="">csw-iso19139</option>
+              <option value="http://standards.iso.org/iso/19115/-3/mdb/2.0">ISO 19115-3</option>
+            </select>
+          </div>
+        </div>
+        <p class="help-block" data-translate="">csw-outputSchemaHelp</p>
+      </div>
+
+      <div>
+        <label class="control-label">
+          <input id="gn-harvest-settings-gn-advanced-distributedsearch-checkbox"
+                 type="checkbox" data-ng-true-value="'distributed'" data-ng-false-value="'local'"
+                 data-ng-model="harvesterSelected.site.queryScope"/>
+          <span id="gn-harvest-settings-gn-advanced-distributedsearch-label" data-translate="">distributedSearch</span>
+        </label>
+
+        <fieldset data-ng-show="harvesterSelected.site.queryScope == 'distributed'">
+          <div class="well">
+            <div id="gn-harvest-settings-gn-advanced-distributedsearch-hopcount-row">
+              <label id="gn-harvest-settings-gn-advanced-distributedsearch-hopcount-label" class="control-label" data-translate="">hopCount</label>
+              <input id="gn-harvest-settings-gn-advanced-distributedsearch-hopcount-input"
+                     type="number" data-gn-string-to-number
+                     class="form-control"
+                     data-ng-model="harvesterSelected.site.hopCount"/>
+
+              <p class="help-block" data-translate="">hopCountHelp</p>
+            </div>
+          </div>
+        </fieldset>
+
+        <p class="help-block" data-translate="">distributedSearchHelp</p>
+      </div>
+    </fieldset>
   </fieldset>
 
 
   <fieldset id="gn-harvest-settings-csw-advanced-row">
-    <legend id="gn-harvest-settings-csw-advanced-title"><span data-translate="">harvesterAdvancedConfigurationFor</span>
+    <legend id="gn-harvest-settings-csw-advanced-title">
+      <i class="fa fa-fw fa-cogs"></i><span data-translate="">harvesterResponseProcessing</span>
       {{harvesterSelected['@type'] | translate}}
     </legend>
 
-    <div id="gn-harvest-settings-csw-advanced-authentication-row" data-gn-harvester-account="harvesterSelected"/>
-
-    <div id="gn-harvest-settings-csw-advanced-duplicate-row">
-      <label class="control-label">
-        <input id="gn-harvest-settings-csw-advanced-duplicate-checkbox"
-               type="checkbox"
-               data-ng-model="harvesterSelected.site.rejectDuplicateResource"/>
-        <span id="gn-harvest-settings-csw-advanced-duplicate-label" data-translate="">csw-rejectDuplicateResource</span>
-      </label>
-      <p class="help-block" data-translate="">csw-rejectDuplicateResourceHelp</p>
-    </div>
-
-    <div id="gn-harvest-settings-csw-advanced-category-row" data-gn-category="harvesterSelected.categories[0]['@id']" data-lang="{{lang}}"
-         data-label="csw-category"/>
+    <div data-gn-harvester-extras="harvesterSelected"></div>
 
+    <fieldset>
+      <legend data-translate="">filteringAndProcessing</legend>
+      <div id="gn-harvest-settings-csw-xpath-filter-title-row">
 
-    <div id="gn-harvest-settings-csw-advanced-validate-row">
-      <label id="gn-harvest-settings-csw-advanced-validate-label" class="control-label">
-        <span data-translate="">harvesterValidate</span>
-      </label>
-      <div id="gn-harvest-settings-csw-advanced-validate-list" data-gn-harvester-validation="harvesterSelected.content.validate"/>
-      <p class="help-block" data-translate="">harvesterValidateHelp</p>
-    </div>
-
-    <div id="gn-harvest-settings-csw-advanced-batchEdits-row">
-      <label id="gn-harvest-settings-csw-advanced-batchEdits-label" class="control-label">
-        <span data-translate="">harvesterBatchEdits</span>
-      </label>
-      <div id="gn-harvest-settings-csw-advanced-validate-list"
-           style="height: 300px"
-           ui-ace="{useWrapMode:true, showGutter:true, mode:'json'}"
-           data-ng-model="harvesterSelected.content.batchEdits"/>
-      <p class="help-block" data-translate="">harvesterBatchEditsHelp</p>
-    </div>
-
-    <div id="gn-harvest-settings-csw-advanced-xsl-row">
-      <label id="gn-harvest-settings-csw-advanced-xsl-label" class="control-label" data-translate="">applyXSLToRecord</label>
-      <div id="gn-harvest-settings-csw-advanced-xsl-list"
-           data-gn-import-xsl="harvesterSelected.site.xslfilter"
-           data-mode="btn-group"/>
-
-      <p class="help-block" data-translate="">applyXSLToRecordHelp</p>
-    </div>
-
-    <div id="gn-harvest-settings-csw-advanced-sortBy-row">
-      <label id="gn-harvest-settings-csw-advanced-sortBy-label"
-             class="control-label"
-             data-translate="">sortBy</label>
-      <input id="gn-harvest-settings-csw-advanced-sortBy-input"
-             type="text"
-             class="form-control gn-csw-criteria"
-             data-ng-model="harvesterSelected.site.sortBy"/>
-      <p class="help-block" data-translate="">csw-sortByHelp</p>
-    </div>
+        <div id="gn-harvest-settings-csw-advanced-validate-row">
+          <label id="gn-harvest-settings-csw-advanced-validate-label" class="control-label">
+            <span data-translate="">harvesterValidate</span>
+          </label>
+          <div id="gn-harvest-settings-csw-advanced-validate-list" data-gn-harvester-validation="harvesterSelected.content.validate"/>
+          <p class="help-block" data-translate="">harvesterValidateHelp</p>
+        </div>
 
-    <div id="gn-harvest-settings-csw-advanced-scheme-row">
-      <div class="row">
-        <div id="gn-harvest-settings-csw-advanced-scheme-output-row"
-             class="col-lg-8 col-md-8 col-sm-8 gn-nopadding-left gn-nopadding-right">
-          <label id="gn-harvest-settings-csw-advanced-scheme-output-label" class="control-label" data-translate="">csw-outputSchema</label>
-          <input id="gn-harvest-settings-csw-advanced-scheme-output-input" type="text" class="form-control gn-csw-criteria" id="csw-outputSchemaInput"
-                 data-ng-model="harvesterSelected.site.outputSchema"/>
+        <div id="gn-harvest-settings-csw-advanced-duplicate-row">
+          <label class="control-label">
+            <input id="gn-harvest-settings-csw-advanced-duplicate-checkbox"
+                   type="checkbox"
+                   data-ng-model="harvesterSelected.site.rejectDuplicateResource"/>
+            <span id="gn-harvest-settings-csw-advanced-duplicate-label" data-translate="">csw-rejectDuplicateResource</span>
+          </label>
+          <p class="help-block" data-translate="">csw-rejectDuplicateResourceHelp</p>
         </div>
-        <div id="gn-harvest-settings-csw-advanced-scheme-recommended-row"
-             class="col-lg-4 col-md-4 col-sm-4 hidden-xs gn-nopadding-right">
-          <label id="gn-harvest-settings-csw-advanced-scheme-recommended-label" class="control-label" data-translate="">csw-outputSchemaOptions</label>
-          <select id="gn-harvest-settings-csw-advanced-scheme-recommended-list"
-                  data-ng-model="harvesterSelected.site.outputSchema"
-                  class="form-control gn-csw-criteria"
-                  id="csw-outputSchemaOptionsSelect">
-            <option value="" disabled="" data-translate="">csw-recommendedValues</option>
-            <option value="http://www.opengis.net/cat/csw/2.0.2" data-translate="">csw-dublinCore</option>
-            <option value="http://www.isotc211.org/2005/gmd" data-translate="">csw-iso19139</option>
-            <option value="http://standards.iso.org/iso/19115/-3/mdb/2.0">ISO 19115-3</option>
-          </select>
+
+        <label id="gn-harvest-settings-csw-xpath-filter-title-label" class="control-label col-lg-4" data-translate="">xpathFilter</label>
+        <div class="col-lg-8">
+          <input id="gn-harvest-settings-csw-xpath-filter-title-input"
+                 type="text"
+                 class="form-control"
+                 data-ng-model="harvesterSelected.site.xpathFilter"/>
         </div>
+        <p class="help-block" data-translate="">xpathFilter-help</p>
       </div>
-      <p class="help-block" data-translate="">csw-outputSchemaHelp</p>
-    </div>
-  </fieldset>
 
+      <div id="gn-harvest-settings-csw-advanced-xsl-row">
+        <label id="gn-harvest-settings-csw-advanced-xsl-label" class="control-label" data-translate="">applyXSLToRecord</label>
+        <div id="gn-harvest-settings-csw-advanced-xsl-list"
+             data-gn-import-xsl="harvesterSelected.site.xslfilter"
+             data-mode="btn-group"/>
 
-  <div>
-    <label class="control-label">
-      <input id="gn-harvest-settings-gn-advanced-distributedsearch-checkbox"
-             type="checkbox" data-ng-true-value="'distributed'" data-ng-false-value="'local'"
-             data-ng-model="harvesterSelected.site.queryScope"/>
-      <span id="gn-harvest-settings-gn-advanced-distributedsearch-label" data-translate="">distributedSearch</span>
-    </label>
-
-    <fieldset data-ng-show="harvesterSelected.site.queryScope == 'distributed'">
-      <div class="well">
-        <div id="gn-harvest-settings-gn-advanced-distributedsearch-hopcount-row">
-          <label id="gn-harvest-settings-gn-advanced-distributedsearch-hopcount-label" class="control-label" data-translate="">hopCount</label>
-          <input id="gn-harvest-settings-gn-advanced-distributedsearch-hopcount-input"
-                 type="number" data-gn-string-to-number
-                 class="form-control"
-                 data-ng-model="harvesterSelected.site.hopCount"/>
+        <p class="help-block" data-translate="">applyXSLToRecordHelp</p>
+      </div>
 
-          <p class="help-block" data-translate="">hopCountHelp</p>
-        </div>
+      <div id="gn-harvest-settings-csw-advanced-batchEdits-row">
+        <label id="gn-harvest-settings-csw-advanced-batchEdits-label" class="control-label">
+          <span data-translate="">harvesterBatchEdits</span>
+        </label>
+        <div id="gn-harvest-settings-csw-advanced-batchEdits-list"
+             style="height: 300px"
+             ui-ace="{useWrapMode:true, showGutter:true, mode:'json'}"
+             data-ng-model="harvesterSelected.content.batchEdits"/>
+        <p class="help-block" data-translate="">harvesterBatchEditsHelp</p>
       </div>
     </fieldset>
 
-    <p class="help-block" data-translate="">distributedSearchHelp</p>
-  </div>
-
+    <div id="gn-harvest-settings-csw-advanced-category-row" data-gn-category="harvesterSelected.categories[0]['@id']" data-lang="{{lang}}"
+         data-label="csw-category"/>
+  </fieldset>
 
-  <div id="gn-harvest-settings-csw-privileges-row" data-gn-harvester-privileges="harvesterSelected" data-lang="{{lang}}"/>
+  <div id="gn-harvest-settings-csw-privileges-row"
+       data-gn-harvester-privileges="harvesterSelected"
+       data-lang="{{lang}}"/>
 </form>
diff --git a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/filesystem.html b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/filesystem.html
index ca9d3ff2c6d..d4939d34f36 100644
--- a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/filesystem.html
+++ b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/filesystem.html
@@ -8,7 +8,7 @@
   </div>
 
   <fieldset id="gn-harvest-settings-file-basic-row">
-    <legend id="gn-harvest-settings-file-basic-title"><span data-translate="">harvesterMainConfigurationFor</span> {{('harvester-' +
+    <legend id="gn-harvest-settings-file-basic-title"><i class="fa fa-fw fa-plug"></i><span data-translate="">harvesterConnectionConfiguration</span> {{('harvester-' +
       harvesterSelected['@type']) | translate}}
     </legend>
     <div id="gn-harvest-settings-file-basic-directory-row" data-ng-class="harvesterSelected.site.directory == '' ? 'has-error' : ''">
@@ -17,71 +17,76 @@
       <p class="help-block" data-translate="">filesystem-directoryHelp</p>
     </div>
 
+    <div id="gn-harvest-settings-file-advanved-subfolders-row">
+      <label class="control-label">
+        <input id="gn-harvest-settings-file-advanved-subfolders-checkbox" type="checkbox" data-ng-model="harvesterSelected.site.recurse"/>
+        <span id="gn-harvest-settings-file-advanved-subfolders-label" data-translate="">filesystem-recurse</span>
+      </label>
+      <p class="help-block" data-translate="">filesystem-recurseHelp</p>
+    </div>
+
+    <div id="gn-harvest-settings-file-advanved-script-row">
+      <label id="gn-harvest-settings-file-advanved-script-label" class="control-label" data-translate="">filesystem-beforeScript</label>
+      <input id="gn-harvest-settings-file-advanved-script-input" type="text" class="form-control" data-ng-model="harvesterSelected.site.beforeScript"/>
+      <p class="help-block" data-translate="">filesystem-beforeScriptHelp</p>
+    </div>
+
     <!--Type of record-->
     <div id="gn-harvest-settings-file-basic-type-row">
       <label id="gn-harvest-settings-file-basic-type-label" class="control-label" data-translate="">typeOfRecord</label>
       <div id="gn-harvest-settings-file-basic-type-list" gn-recordtypes-combo="harvesterSelected.site.recordType"></div>
     </div>
-
   </fieldset>
 
   <fieldset id="gn-harvest-settings-file-advanved-row">
-    <legend id="gn-harvest-settings-file-advanced-title"><span data-translate="">harvesterAdvancedConfigurationFor</span>
+    <legend id="gn-harvest-settings-file-advanced-title"><i class="fa fa-fw fa-cogs"></i><span data-translate="">harvesterResponseProcessing</span>
       {{harvesterSelected['@type'] | translate}}
     </legend>
 
-    <div id="gn-harvest-settings-file-advanved-subfolders-row">
-      <label class="control-label">
-        <input id="gn-harvest-settings-file-advanved-subfolders-checkbox" type="checkbox" data-ng-model="harvesterSelected.site.recurse"/>
-        <span id="gn-harvest-settings-file-advanved-subfolders-label" data-translate="">filesystem-recurse</span>
-      </label>
-      <p class="help-block" data-translate="">filesystem-recurseHelp</p>
-    </div>
+    <div data-gn-harvester-extras="harvesterSelected"></div>
 
-    <div id="gn-harvest-settings-file-advanved-nodelete-row">
-      <label class="control-label">
-        <input id="gn-harvest-settings-file-advanved-nodelete-checkbox" type="checkbox" data-ng-model="harvesterSelected.site.nodelete"/>
-        <span id="gn-harvest-settings-file-advanved-nodelete-label" data-translate="">filesystem-nodelete</span>
-      </label>
-      <p class="help-block" data-translate="">filesystem-nodeleteHelp</p>
-    </div>
+    <fieldset>
+      <legend data-translate="">filteringAndProcessing</legend>
 
-    <div id="gn-harvest-settings-file-advanved-update-row">
-      <label class="control-label">
-        <input id="gn-harvest-settings-file-advanved-update-checkbox"
-               type="checkbox"
-               data-ng-model="harvesterSelected.site.checkFileLastModifiedForUpdate"/>
-        <span id="gn-harvest-settings-file-advanved-update-label" data-translate="">filesystem-checkFileLastModifiedForUpdate</span>
-      </label>
-      <p class="help-block" data-translate="">filesystem-checkFileLastModifiedForUpdateHelp</p>
-    </div>
+      <div id="gn-harvest-settings-file-advanved-update-row">
+        <label class="control-label">
+          <input id="gn-harvest-settings-file-advanved-update-checkbox"
+                 type="checkbox"
+                 data-ng-model="harvesterSelected.site.checkFileLastModifiedForUpdate"/>
+          <span id="gn-harvest-settings-file-advanved-update-label" data-translate="">filesystem-checkFileLastModifiedForUpdate</span>
+        </label>
+        <p class="help-block" data-translate="">filesystem-checkFileLastModifiedForUpdateHelp</p>
+      </div>
+
+      <div id="gn-harvest-settings-file-advanved-nodelete-row">
+        <label class="control-label">
+          <input id="gn-harvest-settings-file-advanved-nodelete-checkbox" type="checkbox" data-ng-model="harvesterSelected.site.nodelete"/>
+          <span id="gn-harvest-settings-file-advanved-nodelete-label" data-translate="">filesystem-nodelete</span>
+        </label>
+        <p class="help-block" data-translate="">filesystem-nodeleteHelp</p>
+      </div>
+
+      <div id="gn-harvest-settings-file-advanved-validate-row">
+        <label id="gn-harvest-settings-file-advanved-validate-label" class="control-label">
+          <span data-translate="">harvesterValidate</span>
+        </label>
+        <div id="gn-harvest-settings-file-advanved-validate-list" data-gn-harvester-validation="harvesterSelected.content.validate"/>
+        <p class="help-block" data-translate="">harvesterValidateHelp</p>
+      </div>
+
+      <div id="gn-harvest-settings-file-advanved-xsl-row">
+        <label id="gn-harvest-settings-file-advanved-xsl-label" class="control-label" data-translate="">applyXSLToRecord</label>
+        <div id="gn-harvest-settings-file-advanved-xsl-list"
+             data-gn-import-xsl="harvesterSelected.content.importxslt"
+             data-mode="btn-group"/>
+        <p class="help-block" data-translate="">applyXSLToRecordHelp</p>
+      </div>
+    </fieldset>
 
     <div id="gn-harvest-settings-file-advanved-categories-row"
          data-gn-category="harvesterSelected.categories[0]['@id']"
          data-lang="{{lang}}"
          data-label="category"/>
-
-    <div id="gn-harvest-settings-file-advanved-validate-row">
-      <label id="gn-harvest-settings-file-advanved-validate-label" class="control-label">
-        <span data-translate="">harvesterValidate</span>
-      </label>
-      <div id="gn-harvest-settings-file-advanved-validate-list" data-gn-harvester-validation="harvesterSelected.content.validate"/>
-      <p class="help-block" data-translate="">harvesterValidateHelp</p>
-    </div>
-
-    <div id="gn-harvest-settings-file-advanved-xsl-row">
-      <label id="gn-harvest-settings-file-advanved-xsl-label" class="control-label" data-translate="">applyXSLToRecord</label>
-      <div id="gn-harvest-settings-file-advanved-xsl-list"
-           data-gn-import-xsl="harvesterSelected.content.importxslt"
-           data-mode="btn-group"/>
-      <p class="help-block" data-translate="">applyXSLToRecordHelp</p>
-    </div>
-
-    <div id="gn-harvest-settings-file-advanved-script-row">
-      <label id="gn-harvest-settings-file-advanved-script-label" class="control-label" data-translate="">filesystem-beforeScript</label>
-      <input id="gn-harvest-settings-file-advanved-script-input" type="text" class="form-control" data-ng-model="harvesterSelected.site.beforeScript"/>
-      <p class="help-block" data-translate="">filesystem-beforeScriptHelp</p>
-    </div>
   </fieldset>
 
   <div id="gn-harvest-settings-file-privileges-row" data-gn-harvester-privileges="harvesterSelected" data-lang="{{lang}}"/>
diff --git a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/geoPREST.html b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/geoPREST.html
index a1693f23a9d..75dbec04246 100644
--- a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/geoPREST.html
+++ b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/geoPREST.html
@@ -8,7 +8,7 @@
   </div>
 
   <fieldset id="gn-harvest-settings-rest-basic-row">
-    <legend id="gn-harvest-settings-rest-basic-title"><span data-translate="">harvesterMainConfigurationFor</span> {{('harvester-' +
+    <legend id="gn-harvest-settings-rest-basic-title"><i class="fa fa-fw fa-plug"></i><span data-translate="">harvesterConnectionConfiguration</span> {{('harvester-' +
       harvesterSelected['@type']) | translate}}
     </legend>
 
@@ -18,6 +18,8 @@
       <p class="help-block" data-translate="">geoPREST-hostHelp</p>
     </div>
 
+    <div id="gn-harvest-settings-rest-advanced-remote-row" data-gn-harvester-account="harvesterSelected"/>
+
     <fieldset id="gn-harvest-settings-rest-basic-filter-row" class="form-horizontal">
       <legend id="gn-harvest-settings-rest-basic-filter-title" data-translate="">harvesterFilter</legend>
 
@@ -37,12 +39,10 @@
   </fieldset>
 
   <fieldset id="gn-harvest-settings-rest-advanced-row">
-    <legend id="gn-harvest-settings-rest-advanced-title"><span data-translate="">harvesterAdvancedConfigurationFor</span>
+    <legend id="gn-harvest-settings-rest-advanced-title"><i class="fa fa-fw fa-cogs"></i><span data-translate="">harvesterResponseProcessing</span>
       {{harvesterSelected['@type'] | translate}}
     </legend>
 
-    <div id="gn-harvest-settings-rest-advanced-remote-row" data-gn-harvester-account="harvesterSelected"/>
-
     <div id="gn-harvest-settings-rest-advanced-validate-row">
       <label id="gn-harvest-settings-rest-advanced-validate-label" class="control-label">
         <span data-translate="">harvesterValidate</span>
diff --git a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/geonetwork.html b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/geonetwork.html
index a986a3e2667..b723d109a8b 100644
--- a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/geonetwork.html
+++ b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/geonetwork.html
@@ -8,7 +8,7 @@
   </div>
 
   <fieldset id="gn-harvest-settings-gn-basic-row">
-    <legend id="gn-harvest-settings-gn-basic-title"><span data-translate="">harvesterMainConfigurationFor</span> {{('harvester-' +
+    <legend id="gn-harvest-settings-gn-basic-title"><i class="fa fa-fw fa-plug"></i><span data-translate="">harvesterConnectionConfiguration</span> {{('harvester-' +
       harvesterSelected['@type']) | translate}}
     </legend>
     <div data-ng-class="harvesterSelected.site.host == '' ? 'has-error' : ''">
@@ -105,11 +105,14 @@ <h4 id="gn-harvest-settings-gn-basic-criteria-title" data-translate="">geonetwor
 
 
   <fieldset id="gn-harvest-settings-gn-advanced-row">
-    <legend id="gn-harvest-settings-gn-advanced-title"><span data-translate="">harvesterAdvancedConfigurationFor</span>
+    <legend id="gn-harvest-settings-gn-advanced-title"><i class="fa fa-fw fa-cogs"></i><span data-translate="">harvesterResponseProcessing</span>
       {{harvesterSelected['@type'] | translate}}
     </legend>
 
-    <div id="gn-harvest-settings-gn-advanced-remote-row" data-gn-harvester-account="harvesterSelected"/>
+    <div data-gn-harvester-extras="harvesterSelected"></div>
+
+    <div id="gn-harvest-settings-gn-advanced-remote-row"
+         data-gn-harvester-account="harvesterSelected"/>
 
     <div id="gn-harvest-settings-gn-advanced-mef-row">
       <label class="control-label">
diff --git a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/geonetwork20.html b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/geonetwork20.html
index 86b94275289..176bbef9026 100644
--- a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/geonetwork20.html
+++ b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/geonetwork20.html
@@ -8,7 +8,7 @@
   </div>
 
   <fieldset id="gn-harvest-settings-gn2-basic-row">
-    <legend id="gn-harvest-settings-gn2-basic-title"><span data-translate="">harvesterMainConfigurationFor</span> {{('harvester-' +
+    <legend id="gn-harvest-settings-gn2-basic-title"><i class="fa fa-fw fa-plug"></i><span data-translate="">harvesterConnectionConfiguration</span> {{('harvester-' +
       harvesterSelected['@type']) | translate}}
     </legend>
 
@@ -74,7 +74,7 @@
   </fieldset>
 
   <fieldset id="gn-harvest-settings-gn2-advanced-row">
-    <legend id="gn-harvest-settings-gn2-advanced-title"><span data-translate="">harvesterAdvancedConfigurationFor</span>
+    <legend id="gn-harvest-settings-gn2-advanced-title"><i class="fa fa-fw fa-cogs"></i><span data-translate="">harvesterResponseProcessing</span>
       {{harvesterSelected['@type'] | translate}}
     </legend>
 
diff --git a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/oaipmh.html b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/oaipmh.html
index 3cdd04a249f..8685ca8b20d 100644
--- a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/oaipmh.html
+++ b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/oaipmh.html
@@ -8,7 +8,7 @@
   </div>
 
   <fieldset id="gn-harvest-settings-oai-basic-row">
-    <legend id="gn-harvest-settings-oai-basic-title"><span data-translate="">harvesterMainConfigurationFor</span> {{('harvester-' +
+    <legend id="gn-harvest-settings-oai-basic-title"><i class="fa fa-fw fa-plug"></i><span data-translate="">harvesterConnectionConfiguration</span> {{('harvester-' +
       harvesterSelected['@type']) | translate}}
     </legend>
     <div id="gn-harvest-settings-oai-basic-url-row" data-ng-class="harvesterSelected.site.host == '' ? 'has-error' : ''">
@@ -20,6 +20,8 @@
       </div>
     </div>
 
+    <div id="gn-harvest-settings-oai-advanced-remote-row" data-gn-harvester-account="harvesterSelected"/>
+
     <fieldset id="gn-harvest-settings-oai-basic-filter-row" class="form-horizontal">
       <legend id="gn-harvest-settings-oai-basic-filter-title" data-translate="">harvesterFilter</legend>
 
@@ -70,30 +72,34 @@
   </fieldset>
 
   <fieldset id="gn-harvest-settings-oai-advanced-row">
-    <legend><span data-translate="">harvesterAdvancedConfigurationFor</span>
+    <legend><i class="fa fa-fw fa-cogs"></i><span data-translate="">harvesterResponseProcessing</span>
       {{harvesterSelected['@type'] | translate}}
     </legend>
 
-    <div id="gn-harvest-settings-oai-advanced-remote-row" data-gn-harvester-account="harvesterSelected"/>
-    <div id="gn-harvest-settings-oai-advanced-validate-row">
-      <label id="gn-harvest-settings-oai-advanced-validate-label" class="control-label">
-        <span data-translate="">harvesterValidate</span>
-      </label>
-      <div id="gn-harvest-settings-oai-advanced-validate-list" data-gn-harvester-validation="harvesterSelected.content.validate"/>
-      <p class="help-block" data-translate="">harvesterValidateHelp</p>
-    </div>
+    <div data-gn-harvester-extras="harvesterSelected"></div>
+
+    <fieldset>
+      <legend data-translate="">filteringAndProcessing</legend>
+      <div id="gn-harvest-settings-oai-advanced-validate-row">
+        <label id="gn-harvest-settings-oai-advanced-validate-label" class="control-label">
+          <span data-translate="">harvesterValidate</span>
+        </label>
+        <div id="gn-harvest-settings-oai-advanced-validate-list" data-gn-harvester-validation="harvesterSelected.content.validate"/>
+        <p class="help-block" data-translate="">harvesterValidateHelp</p>
+      </div>
+
+      <div id="gn-harvest-settings-oai-advanced-xsl-row">
+        <label id="gn-harvest-settings-oai-advanced-xsl-label" class="control-label" data-translate="">applyXSLToRecord</label>
+        <input id="gn-harvest-settings-oai-advanced-xsl-input" type="text" class="form-control" data-ng-model="harvesterSelected.site.xslfilter"/>
+        <p class="help-block" data-translate="">applyXSLToRecordHelp</p>
+      </div>
+    </fieldset>
 
     <div id="gn-harvest-settings-oai-advanced-categories-row"
          data-gn-category="harvesterSelected.categories[0]['@id']" data-lang="{{lang}}"
          data-label="category"/>
-
-    <div id="gn-harvest-settings-oai-advanced-xsl-row">
-      <label id="gn-harvest-settings-oai-advanced-xsl-label" class="control-label" data-translate="">applyXSLToRecord</label>
-      <input id="gn-harvest-settings-oai-advanced-xsl-input" type="text" class="form-control" data-ng-model="harvesterSelected.site.xslfilter"/>
-      <p class="help-block" data-translate="">applyXSLToRecordHelp</p>
-    </div>
-
   </fieldset>
 
-  <div id="gn-harvest-settings-oai-privileges-row" data-gn-harvester-privileges="harvesterSelected" data-lang="{{lang}}"/>
+  <div id="gn-harvest-settings-oai-privileges-row"
+       data-gn-harvester-privileges="harvesterSelected" data-lang="{{lang}}"/>
 </form>
diff --git a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/ogcwxs.html b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/ogcwxs.html
index ec964ac7d49..324e0a87ec0 100644
--- a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/ogcwxs.html
+++ b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/ogcwxs.html
@@ -8,7 +8,7 @@
   </div>
 
   <fieldset id="gn-harvest-settings-ogc-basic-row">
-    <legend id="gn-harvest-settings-ogc-basic-title"><span data-translate="">harvesterMainConfigurationFor</span> {{('harvester-' +
+    <legend id="gn-harvest-settings-ogc-basic-title"><i class="fa fa-fw fa-plug"></i><span data-translate="">harvesterConnectionConfiguration</span> {{('harvester-' +
       harvesterSelected['@type']) | translate}}
     </legend>
 
@@ -30,140 +30,153 @@
       </select>
       <p class="help-block" data-translate="">serviceTypeHelp</p>
     </div>
+
+    <div id="gn-harvest-settings-ogc-advanced-remote-row" data-gn-harvester-account="harvesterSelected"/>
+
   </fieldset>
 
   <fieldset id="gn-harvest-settings-ogc-advanced-row">
-    <legend id="gn-harvest-settings-ogc-advanced-title"><span data-translate="">harvesterAdvancedConfigurationFor</span>
+    <legend id="gn-harvest-settings-ogc-advanced-title"><i class="fa fa-fw fa-cogs"></i><span data-translate="">harvesterResponseProcessing</span>
       {{harvesterSelected['@type'] | translate}}
     </legend>
 
-    <div id="gn-harvest-settings-ogc-advanced-remote-row" data-gn-harvester-account="harvesterSelected"/>
-
-    <!-- Service metadata record -->
-    <div id="gn-harvest-settings-ogc-advanced-template-row"
-         data-ng-show="harvesterSelected.site.ogctype.match('^(WMS|WFS|WCS|CSW|SOS|WPS)') != null">
-      <label id="gn-harvest-settings-ogc-advanced-template-label" class="control-label">
-        <span data-translate="">ogcwxs-serviceTemplateUuid</span>
-      </label>
-      <select id="gn-harvest-settings-ogc-advanced-template-list"
-              class="form-control"
-              data-ng-model="harvesterSelected.options.serviceTemplateUuid"
-              data-ng-options="t._id as t._source.resourceTitleObject.default for t in ogcwxsTemplates">
-      </select>
-      <p class="help-block" data-translate="">ogcwxs-serviceTemplateUuidHelp</p>
-    </div>
-
-    <div id="gn-harvest-settings-ogc-advanced-category-row"
-         data-gn-category="harvesterSelected.categories[0]['@id']" data-lang="{{lang}}"
-         data-label="ogcwxs-serviceCategory"/>
-
-    <!-- Dataset metadata records -->
-    <div id="gn-harvest-settings-ogc-advanced-record-row">
-      <label class="control-label">
-        <input id="gn-harvest-settings-ogc-advanced-record-checkbox"
-               type="checkbox"
-               data-ng-disabled="harvesterSelected.site.ogctype.match('^(WMS|WMTS|WFS|WCS|SOS|WPS2)') == null"
-               data-ng-model="harvesterSelected.options.useLayer"/>
-        <span id="gn-harvest-settings-ogc-advanced-record-label" data-translate="" translate-values="{metadataTemplateType: metadataTemplateType}">ogcwxs-createMetadataForEachLayer</span>
-      </label>
-      <p class="help-block" data-translate="" translate-values="{metadataTemplateType: metadataTemplateType}">
-        ogcwxs-createMetadataForEachLayerHelp</span>
-    </div>
+    <fieldset>
+      <legend data-translate="">recordCreationOptions</legend>
 
-    <div id="gn-harvest-settings-ogc-advanced-records-row"
-         class="well"
-         data-ng-show="harvesterSelected.options.useLayer">
-      <div id="gn-harvest-settings-ogc-advanced-records-imports-row"
-           data-ng-hide="harvesterSelected.site.ogctype.indexOf('WMTS') === 0">
-        <label class="control-label">
-          <input id="gn-harvest-settings-ogc-advanced-records-imports-checkbox" type="checkbox" data-ng-model="harvesterSelected.options.useLayerMd"/>
-          <span id="gn-harvest-settings-ogc-advanced-records-imports-label" data-translate="" translate-values="{metadataTemplateType: metadataTemplateType}">ogcwxs-createMetadataForEachLayerUsingMetadataURL</span>
-        </label>
-        <p class="help-block" data-translate="" translate-values="{metadataTemplateType: metadataTemplateType}"
-        >ogcwxs-createMetadataForEachLayerUsingMetadataURLHelp</p>
-      </div>
-
-      <div id="gn-harvest-settings-ogc-advanced-records-template-row"
-           data-ng-show="harvesterSelected.site.ogctype.match('^(WMS|WFS|WCS|SOS|WPS)') != null">
-        <label id="gn-harvest-settings-ogc-advanced-records-template-label" class="control-label">
-          <span data-translate="">ogcwxs-datasetTemplateUuid</span>
+      <!-- Service metadata record -->
+      <div id="gn-harvest-settings-ogc-advanced-template-row"
+           data-ng-show="harvesterSelected.site.ogctype.match('^(WMS|WFS|WCS|CSW|SOS|WPS)') != null">
+        <label id="gn-harvest-settings-ogc-advanced-template-label" class="control-label">
+          <span data-translate="">ogcwxs-serviceTemplateUuid</span>
         </label>
-        <select id="gn-harvest-settings-ogc-advanced-records-template-list"
+        <select id="gn-harvest-settings-ogc-advanced-template-list"
                 class="form-control"
-                data-ng-model="harvesterSelected.options.datasetTemplateUuid"
-                data-ng-options="t._id as t._source.resourceTitleObject.default for t in ogcwxsDatasetTemplates">
+                data-ng-model="harvesterSelected.options.serviceTemplateUuid"
+                data-ng-options="t._id as t._source.resourceTitleObject.default for t in ogcwxsTemplates">
         </select>
-        <!--
-        TODO: This need more work as it requires changes in the XSL transformation
-        to inject process info in a serviceIdentification and not a dataIdentification.
-        <select id="gn-harvest-settings-ogc-advanced-records-template-list-wps2"
-                data-ng-show="harvesterSelected.site.ogctype.match('^(WPS2)') != null"
-                class="form-control"
-                data-ng-model="harvesterSelected.options.datasetTemplateUuid"
-                data-ng-options="t['geonet:info'].uuid as t.getTitle() for t in ogcwxsTemplates">
-        </select>-->
-        <p class="help-block" data-translate="">ogcwxs-datasetTemplateUuidHelp</p>
+        <p class="help-block" data-translate="">ogcwxs-serviceTemplateUuidHelp</p>
       </div>
 
-      <div id="gn-harvest-settings-ogc-advanced-records-thumbnail-row"
-           data-ng-hide="harvesterSelected.site.ogctype.indexOf('WMS') !== 0">
+
+      <div id="gn-harvest-settings-ogc-advanced-category-row"
+           data-gn-category="harvesterSelected.categories[0]['@id']" data-lang="{{lang}}"
+           data-label="ogcwxs-serviceCategory"/>
+
+      <!-- Dataset metadata records -->
+      <div id="gn-harvest-settings-ogc-advanced-record-row">
         <label class="control-label">
-          <input id="gn-harvest-settings-ogc-advanced-records-thumbnail-checkbox"
+          <input id="gn-harvest-settings-ogc-advanced-record-checkbox"
                  type="checkbox"
-                 data-ng-disabled="harvesterSelected.site.ogctype.indexOf('WMS') !== 0"
-                 data-ng-model="harvesterSelected.options.createThumbnails"/>
-          <span id="gn-harvest-settings-ogc-advanced-records-thumbnail-label" data-translate="">ogcwxs-createThumbnails</span>
+                 data-ng-disabled="harvesterSelected.site.ogctype.match('^(WMS|WMTS|WFS|WCS|SOS|WPS2)') == null"
+                 data-ng-model="harvesterSelected.options.useLayer"/>
+          <span id="gn-harvest-settings-ogc-advanced-record-label" data-translate="" translate-values="{metadataTemplateType: metadataTemplateType}">ogcwxs-createMetadataForEachLayer</span>
         </label>
-        <p class="help-block" data-translate="">ogcwxs-createThumbnailsHelp</p>
+        <p class="help-block" data-translate="" translate-values="{metadataTemplateType: metadataTemplateType}">
+          ogcwxs-createMetadataForEachLayerHelp</span>
       </div>
 
-      <div id="gn-harvest-settings-ogc-advanced-records-category-row"
-           data-gn-category="harvesterSelected.options.datasetCategory"
-           data-lang="{{lang}}"
-           data-label="ogcwxs-datasetCategory"/>
-    </div>
+      <div id="gn-harvest-settings-ogc-advanced-records-row"
+           class="well"
+           data-ng-show="harvesterSelected.options.useLayer">
+        <div id="gn-harvest-settings-ogc-advanced-records-imports-row"
+             data-ng-hide="harvesterSelected.site.ogctype.indexOf('WMTS') === 0">
+          <label class="control-label">
+            <input id="gn-harvest-settings-ogc-advanced-records-imports-checkbox" type="checkbox" data-ng-model="harvesterSelected.options.useLayerMd"/>
+            <span id="gn-harvest-settings-ogc-advanced-records-imports-label" data-translate="" translate-values="{metadataTemplateType: metadataTemplateType}">ogcwxs-createMetadataForEachLayerUsingMetadataURL</span>
+          </label>
+          <p class="help-block" data-translate="" translate-values="{metadataTemplateType: metadataTemplateType}"
+          >ogcwxs-createMetadataForEachLayerUsingMetadataURLHelp</p>
+        </div>
+
+        <div id="gn-harvest-settings-ogc-advanced-records-template-row"
+             data-ng-show="harvesterSelected.site.ogctype.match('^(WMS|WFS|WCS|SOS|WPS)') != null">
+          <label id="gn-harvest-settings-ogc-advanced-records-template-label" class="control-label">
+            <span data-translate="">ogcwxs-datasetTemplateUuid</span>
+          </label>
+          <select id="gn-harvest-settings-ogc-advanced-records-template-list"
+                  class="form-control"
+                  data-ng-model="harvesterSelected.options.datasetTemplateUuid"
+                  data-ng-options="t._id as t._source.resourceTitleObject.default for t in ogcwxsDatasetTemplates">
+          </select>
+          <!--
+          TODO: This need more work as it requires changes in the XSL transformation
+          to inject process info in a serviceIdentification and not a dataIdentification.
+          <select id="gn-harvest-settings-ogc-advanced-records-template-list-wps2"
+                  data-ng-show="harvesterSelected.site.ogctype.match('^(WPS2)') != null"
+                  class="form-control"
+                  data-ng-model="harvesterSelected.options.datasetTemplateUuid"
+                  data-ng-options="t['geonet:info'].uuid as t.getTitle() for t in ogcwxsTemplates">
+          </select>-->
+          <p class="help-block" data-translate="">ogcwxs-datasetTemplateUuidHelp</p>
+        </div>
+
+        <div id="gn-harvest-settings-ogc-advanced-records-thumbnail-row"
+             data-ng-hide="harvesterSelected.site.ogctype.indexOf('WMS') !== 0">
+          <label class="control-label">
+            <input id="gn-harvest-settings-ogc-advanced-records-thumbnail-checkbox"
+                   type="checkbox"
+                   data-ng-disabled="harvesterSelected.site.ogctype.indexOf('WMS') !== 0"
+                   data-ng-model="harvesterSelected.options.createThumbnails"/>
+            <span id="gn-harvest-settings-ogc-advanced-records-thumbnail-label" data-translate="">ogcwxs-createThumbnails</span>
+          </label>
+          <p class="help-block" data-translate="">ogcwxs-createThumbnailsHelp</p>
+        </div>
+
+        <div id="gn-harvest-settings-ogc-advanced-records-category-row"
+             data-gn-category="harvesterSelected.options.datasetCategory"
+             data-lang="{{lang}}"
+             data-label="ogcwxs-datasetCategory"/>
+      </div>
 
-    <!-- Those properties are only required if a template is not used. -->
-    <div id="gn-harvest-settings-ogc-advanced-topic-row" data-ng-show="harvesterSelected.options.serviceTemplateUuid == '' || harvesterSelected.options.datasetTemplateUuid == ''">
-      <label id="gn-harvest-settings-ogc-advanced-topic-label" class="control-label" data-translate="">ogcwxs-topicCategory</label>
-      <div
-        id="gn-harvest-settings-ogc-advanced-topic-list"
-        data-schema-info-combo="codelist"
-        data-selected-info="harvesterSelected.options.topic"
-        data-gn-schema-info="gmd:MD_TopicCategoryCode"
-        lang="lang"></div>
-    </div>
+      <!-- Those properties are only required if a template is not used. -->
+      <div id="gn-harvest-settings-ogc-advanced-topic-row" data-ng-show="harvesterSelected.options.serviceTemplateUuid == '' || harvesterSelected.options.datasetTemplateUuid == ''">
+        <label id="gn-harvest-settings-ogc-advanced-topic-label" class="control-label" data-translate="">ogcwxs-topicCategory</label>
+        <div
+          id="gn-harvest-settings-ogc-advanced-topic-list"
+          data-schema-info-combo="codelist"
+          data-selected-info="harvesterSelected.options.topic"
+          data-gn-schema-info="gmd:MD_TopicCategoryCode"
+          lang="lang"></div>
+      </div>
 
-    <div id="gn-harvest-settings-ogc-advanced-lang-row" data-ng-show="harvesterSelected.options.serviceTemplateUuid == '' || harvesterSelected.options.datasetTemplateUuid == ''">
-      <label id="gn-harvest-settings-ogc-advanced-lang-label"class="control-label" data-translate="">ogcwxs-metadataLanguage</label>
-      <input id="gn-harvest-settings-ogc-advanced-lang-input"
-             type="text"
-             class="form-control"
-             data-ng-model="harvesterSelected.options.lang"
-             data-gn-language-picker=""/>
-    </div>
+      <div id="gn-harvest-settings-ogc-advanced-lang-row" data-ng-show="harvesterSelected.options.serviceTemplateUuid == '' || harvesterSelected.options.datasetTemplateUuid == ''">
+        <label id="gn-harvest-settings-ogc-advanced-lang-label"class="control-label" data-translate="">ogcwxs-metadataLanguage</label>
+        <input id="gn-harvest-settings-ogc-advanced-lang-input"
+               type="text"
+               class="form-control"
+               data-ng-model="harvesterSelected.options.lang"
+               data-gn-language-picker=""/>
+      </div>
 
-    <div id="gn-harvest-settings-ogc-advanced-schema-row" data-ng-show="harvesterSelected.options.serviceTemplateUuid == '' || harvesterSelected.options.datasetTemplateUuid == ''">
-      <label id="gn-harvest-settings-ogc-advanced-schema-label" class="control-label" data-translate="">ogcwxs-outputSchema</label>
-      <input id="gn-harvest-settings-ogc-advanced-schema-input" type="text" class="form-control"
-             data-ng-model="harvesterSelected.options.outputSchema"/>
-    </div>
+      <div id="gn-harvest-settings-ogc-advanced-schema-row" data-ng-show="harvesterSelected.options.serviceTemplateUuid == '' || harvesterSelected.options.datasetTemplateUuid == ''">
+        <label id="gn-harvest-settings-ogc-advanced-schema-label" class="control-label" data-translate="">ogcwxs-outputSchema</label>
+        <input id="gn-harvest-settings-ogc-advanced-schema-input" type="text" class="form-control"
+               data-ng-model="harvesterSelected.options.outputSchema"/>
+      </div>
 
-    <div id="gn-harvest-settings-ogc-advanced-validate-row">
-      <label id="gn-harvest-settings-ogc-advanced-validate-label" class="control-label">
-        <span data-translate="">harvesterValidate</span>
-      </label>
-      <div id="gn-harvest-settings-ogc-advanced-validate-list" data-gn-harvester-validation="harvesterSelected.content.validate"/>
-      <p class="help-block" data-translate="">harvesterValidateHelp</p>
-    </div>
 
-    <div id="gn-harvest-settings-ogc-advanced-xsl-row">
-      <label id="gn-harvest-settings-ogc-advanced-xsl-label" class="control-label" data-translate="">applyXSLToRecord</label>
-      <div id="gn-harvest-settings-ogc-advanced-xsl-list"
-           data-gn-import-xsl="harvesterSelected.content.importxslt"
-           data-mode="btn-group"/>
-      <p class="help-block" data-translate="">applyXSLToRecordHelp</p>
-    </div>
+    </fieldset>
+
+
+    <fieldset>
+      <legend data-translate="">filteringAndProcessing</legend>
+
+      <div id="gn-harvest-settings-ogc-advanced-validate-row">
+        <label id="gn-harvest-settings-ogc-advanced-validate-label" class="control-label">
+          <span data-translate="">harvesterValidate</span>
+        </label>
+        <div id="gn-harvest-settings-ogc-advanced-validate-list" data-gn-harvester-validation="harvesterSelected.content.validate"/>
+        <p class="help-block" data-translate="">harvesterValidateHelp</p>
+      </div>
+
+      <div id="gn-harvest-settings-ogc-advanced-xsl-row">
+        <label id="gn-harvest-settings-ogc-advanced-xsl-label" class="control-label" data-translate="">applyXSLToRecord</label>
+        <div id="gn-harvest-settings-ogc-advanced-xsl-list"
+             data-gn-import-xsl="harvesterSelected.content.importxslt"
+             data-mode="btn-group"/>
+        <p class="help-block" data-translate="">applyXSLToRecordHelp</p>
+      </div>
+    </fieldset>
   </fieldset>
 
   <div id="gn-harvest-settings-ogc-privileges-row" data-gn-harvester-privileges="harvesterSelected" data-lang="{{lang}}"/>
diff --git a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/simpleurl.html b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/simpleurl.html
index 4581d82ec12..c533b26197c 100644
--- a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/simpleurl.html
+++ b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/simpleurl.html
@@ -8,7 +8,7 @@
 
 
   <fieldset id="gn-harvest-settings-simpleurl-basic-row">
-    <legend id="gn-harvest-settings-simpleurl-basic-title"><span data-translate="">harvesterMainConfigurationFor</span> {{('harvester-' +
+    <legend id="gn-harvest-settings-simpleurl-basic-title"><i class="fa fa-fw fa-plug"></i><span data-translate="">harvesterConnectionConfiguration</span> {{('harvester-' +
       harvesterSelected['@type']) | translate}}
     </legend>
     <div id="gn-harvest-settings-simpleurl-basic-service-row" data-ng-class="harvesterSelected.site.url == '' ? 'has-error' : ''">
@@ -20,16 +20,17 @@
              data-ng-model="harvesterSelected.site.url"/>
       <p class="help-block" data-translate="">simpleurl-urlHelp</p>
     </div>
+
+    <div id="gn-harvest-settings-simpleurl-advanced-authentication-row" data-gn-harvester-account="harvesterSelected"/>
+
   </fieldset>
 
 
   <fieldset id="gn-harvest-settings-simpleurl-advanced-row">
-    <legend id="gn-harvest-settings-simpleurl-advanced-title"><span data-translate="">harvesterAdvancedConfigurationFor</span>
+    <legend id="gn-harvest-settings-simpleurl-advanced-title"><i class="fa fa-fw fa-cogs"></i><span data-translate="">harvesterResponseProcessing</span>
       {{harvesterSelected['@type'] | translate}}
     </legend>
 
-    <div id="gn-harvest-settings-simpleurl-advanced-authentication-row" data-gn-harvester-account="harvesterSelected"/>
-
     <div id="gn-harvest-settings-loopElement-row"
          data-ng-class="harvesterSelected.site.loopElement == '' ? 'has-error' : ''">
       <label id="gn-harvest-settings-loopElement-label" class="control-label"
diff --git a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/thredds.html b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/thredds.html
index 77146419183..04d78ba3e7e 100644
--- a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/thredds.html
+++ b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/thredds.html
@@ -10,7 +10,7 @@
 
 
   <fieldset>
-    <legend><span data-translate="">harvesterMainConfigurationFor</span> {{('harvester-' +
+    <legend><i class="fa fa-fw fa-plug"></i><span data-translate="">harvesterConnectionConfiguration</span> {{('harvester-' +
       harvesterSelected['@type']) | translate}}
     </legend>
     <div data-ng-class="harvesterSelected.site.url == '' ? 'has-error' : ''">
@@ -23,7 +23,7 @@
 
 
   <fieldset>
-    <legend><span data-translate="">harvesterAdvancedConfigurationFor</span>
+    <legend><i class="fa fa-fw fa-cogs"></i><span data-translate="">harvesterResponseProcessing</span>
       {{harvesterSelected['@type'] | translate}}
     </legend>
 
diff --git a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/webdav.html b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/webdav.html
index ceea0b31b91..b1a5a7fc0fa 100644
--- a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/webdav.html
+++ b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/webdav.html
@@ -8,7 +8,7 @@
   </div>
 
   <fieldset id="gn-harvest-settings-webdav-basic-row">
-    <legend id="gn-harvest-settings-webdav-basic-title"><span data-translate="">harvesterMainConfigurationFor</span> {{('harvester-' +
+    <legend id="gn-harvest-settings-webdav-basic-title"><i class="fa fa-fw fa-plug"></i><span data-translate="">harvesterConnectionConfiguration</span> {{('harvester-' +
       harvesterSelected['@type']) | translate}}
     </legend>
 
@@ -28,12 +28,8 @@
       </select>
       <p class="help-block" data-translate="">webdav-subtypeHelp</p>
     </div>
-  </fieldset>
 
-  <fieldset id="gn-harvest-settings-webdav-advanced-row">
-    <legend id="gn-harvest-settings-webdav-advanced-title"><span data-translate="">harvesterAdvancedConfigurationFor</span>
-      {{harvesterSelected['@type'] | translate}}
-    </legend>
+    <div id="gn-harvest-settings-webdav-advanced-remote-row" data-gn-harvester-account="harvesterSelected"/>
 
     <div id="gn-harvest-settings-webdav-advanced-subfolder-row">
       <label class="control-label">
@@ -42,20 +38,30 @@
       </label>
       <p class="help-block" data-translate="">webdav-recurseHelp</p>
     </div>
+  </fieldset>
 
-    <div id="gn-harvest-settings-webdav-advanced-remote-row" data-gn-harvester-account="harvesterSelected"/>
+  <fieldset id="gn-harvest-settings-webdav-advanced-row">
+    <legend id="gn-harvest-settings-webdav-advanced-title"><i class="fa fa-fw fa-cogs"></i><span data-translate="">harvesterResponseProcessing</span>
+      {{harvesterSelected['@type'] | translate}}
+    </legend>
+
+    <div data-gn-harvester-extras="harvesterSelected"></div>
+
+    <fieldset>
+      <legend data-translate="">filteringAndProcessing</legend>
+
+      <div id="gn-harvest-settings-webdav-advanced-validate-row">
+        <label id="gn-harvest-settings-webdav-advanced-validate-label" class="control-label">
+          <span data-translate="">harvesterValidate</span>
+        </label>
+        <div id="gn-harvest-settings-webdav-advanced-validate-list" data-gn-harvester-validation="harvesterSelected.content.validate"/>
+        <p class="help-block" data-translate="">harvesterValidateHelp</p>
+      </div>
+    </fieldset>
 
     <div id="gn-harvest-settings-webdav-advanced-category-row"
          data-gn-category="harvesterSelected.categories[0]['@id']" data-lang="{{lang}}"
          data-label="category"/>
-
-    <div id="gn-harvest-settings-webdav-advanced-validate-row">
-      <label id="gn-harvest-settings-webdav-advanced-validate-label" class="control-label">
-        <span data-translate="">harvesterValidate</span>
-      </label>
-      <div id="gn-harvest-settings-webdav-advanced-validate-list" data-gn-harvester-validation="harvesterSelected.content.validate"/>
-      <p class="help-block" data-translate="">harvesterValidateHelp</p>
-    </div>
   </fieldset>
 
   <div id="gn-harvest-settings-webdav-privileges-row" data-gn-harvester-privileges="harvesterSelected" data-lang="{{lang}}"/>
diff --git a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/wfsfeatures.html b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/wfsfeatures.html
index d5fe69040fd..1c73b204a59 100644
--- a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/wfsfeatures.html
+++ b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/wfsfeatures.html
@@ -8,7 +8,7 @@
   </div>
 
   <fieldset id="gn-harvest-settings-wfs-basic-row">
-    <legend id="gn-harvest-settings-wfs-basic-title"><span data-translate="">harvesterMainConfigurationFor</span> {{('harvester-' +
+    <legend id="gn-harvest-settings-wfs-basic-title"><i class="fa fa-fw fa-plug"></i><span data-translate="">harvesterConnectionConfiguration</span> {{('harvester-' +
       harvesterSelected['@type']) | translate}}
     </legend>
 
@@ -18,6 +18,8 @@
       <p class="help-block" data-translate="">serviceUrlHelp</p>
     </div>
 
+    <div id="gn-harvest-settings-wfs-advanced-remote-row" data-gn-harvester-account="harvesterSelected"/>
+
     <div id="gn-harvest-settings-wfs-basic-query-row">
       <label id="gn-harvest-settings-wfs-basic-query-label" class="control-label" data-translate="">wfsfeatures-query</label>
       <textarea id="gn-harvest-settings-wfs-basic-query-textarea" class="form-control" data-ng-model="harvesterSelected.options.query"/>
@@ -25,12 +27,10 @@
   </fieldset>
 
   <fieldset id="gn-harvest-settings-wfs-advanced-row">
-    <legend id="gn-harvest-settings-wfs-advanced-title"><span data-translate="">harvesterAdvancedConfigurationFor</span>
+    <legend id="gn-harvest-settings-wfs-advanced-title"><i class="fa fa-fw fa-cogs"></i><span data-translate="">harvesterResponseProcessing</span>
       {{harvesterSelected['@type'] | translate}}
     </legend>
 
-    <div id="gn-harvest-settings-wfs-advanced-remote-row" data-gn-harvester-account="harvesterSelected"/>
-
     <!-- TODO: Could be nicer to have a list of languages -->
     <div id="gn-harvest-settings-wfs-advanced-lang-row">
       <label id="gn-harvest-settings-wfs-advanced-lang-label" class="control-label" data-translate="">wfsfeatures-metadataLanguage</label>