diff --git a/.github/ISSUE_TEMPLATE/thehive3_bug_report.md b/.github/ISSUE_TEMPLATE/thehive3_bug_report.md
index f73685e1cc..f49a423737 100644
--- a/.github/ISSUE_TEMPLATE/thehive3_bug_report.md
+++ b/.github/ISSUE_TEMPLATE/thehive3_bug_report.md
@@ -16,8 +16,14 @@ Bug
 | -------------------------- | ------------------------------------- |
 | OS version (server)        | Debian, Ubuntu, CentOS, RedHat, ...   |
 | OS version (client)        | XP, Seven, 10, Ubuntu, ...            |
-| TheHive version / git hash | 3.x, hash of the commit               |
+| Virtualized  Env.          | True / False                          |
+| Dedicated RAM              | XX GB                                 |
+| vCPU                       | 4 / 8 / 16 / 32                       |
+| TheHive version / git hash | 4.x, hash of the commit               |
 | Package Type               | RPM, DEB, Docker, Binary, From source |
+| Database                   | Cassandra / BerlkelyDB                |
+| Index type                 | Lucene / Elasticsearch                |
+| Attachments storage        | Local, NFS, S3, HDFS                  |
 | Browser type & version     | If applicable                         |
 
 
diff --git a/.github/ISSUE_TEMPLATE/thehive4_bug_report.md b/.github/ISSUE_TEMPLATE/thehive4_bug_report.md
index 3e158e3a33..19a0214625 100644
--- a/.github/ISSUE_TEMPLATE/thehive4_bug_report.md
+++ b/.github/ISSUE_TEMPLATE/thehive4_bug_report.md
@@ -16,8 +16,14 @@ Bug
 | -------------------------- | ------------------------------------- |
 | OS version (server)        | Debian, Ubuntu, CentOS, RedHat, ...   |
 | OS version (client)        | XP, Seven, 10, Ubuntu, ...            |
+| Virtualized  Env.          | True / False                          |
+| Dedicated RAM              | XX GB                                 |
+| vCPU                       | 4 / 8 / 16 / 32                       |
 | TheHive version / git hash | 4.x, hash of the commit               |
 | Package Type               | RPM, DEB, Docker, Binary, From source |
+| Database                   | Cassandra / BerlkelyDB                |
+| Index type                 | Lucene / Elasticsearch                |
+| Attachments storage        | Local, NFS, S3, HDFS                  |
 | Browser type & version     | If applicable                         |
 
 
diff --git a/.github/ISSUE_TEMPLATE/thehive4_question.md b/.github/ISSUE_TEMPLATE/thehive4_question.md
index a551433c07..3cab78c3e0 100644
--- a/.github/ISSUE_TEMPLATE/thehive4_question.md
+++ b/.github/ISSUE_TEMPLATE/thehive4_question.md
@@ -13,13 +13,19 @@ Question
 
 ### Work Environment
 
-| Question              | Answer
-|---------------------------|--------------------
-| OS version (server)       | Debian, Ubuntu, CentOS, RedHat, ...
-| OS version (client)       | XP, Seven, 10, Ubuntu, ...
-| TheHive version / git hash   | 4.x, hash of the commit
-| Package Type              | RPM, DEB, Docker, Binary, From source
-| Browser type & version    | If applicable
+| Question                   | Answer                                |
+| -------------------------- | ------------------------------------- |
+| OS version (server)        | Debian, Ubuntu, CentOS, RedHat, ...   |
+| OS version (client)        | XP, Seven, 10, Ubuntu, ...            |
+| Virtualized  Env.          | True / False                          |
+| Dedicated RAM              | XX GB                                 |
+| vCPU                       | 4 / 8 / 16 / 32                       |
+| TheHive version / git hash | 4.x, hash of the commit               |
+| Package Type               | RPM, DEB, Docker, Binary, From source |
+| Database                   | Cassandra / BerlkelyDB                |
+| Index type                 | Lucene / Elasticsearch                |
+| Attachments storage        | Local, NFS, S3, HDFS                  |
+| Browser type & version     | If applicable                         |
 
 ### Question
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb8360bf07..03615d5be2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Change Log
 
+## [4.1.4](https://github.com/TheHive-Project/TheHive/milestone/73) (2021-04-15)
+
+**Implemented enhancements:**
+
+- [Feature Request] Sort case templates in alert Import drop down menu [\#1956](https://github.com/TheHive-Project/TheHive/issues/1956)
+- [Enhancement] Make alert deletion more robust [\#1967](https://github.com/TheHive-Project/TheHive/issues/1967)
+
+**Fixed bugs:**
+
+- [Bug] Alert counter refresh not working [\#1911](https://github.com/TheHive-Project/TheHive/issues/1911)
+- [Bug] Enabled or Disabled Taxonomies doesn't work [\#1957](https://github.com/TheHive-Project/TheHive/issues/1957)
+- [Bug] TheHive 4.1.3-1 Task in Case is not visible [\#1964](https://github.com/TheHive-Project/TheHive/issues/1964)
+- [Bug] Aggregation on custom fields provides incorect result (again) [\#1965](https://github.com/TheHive-Project/TheHive/issues/1965)
+- [Bug] TheHive startup times out if schema evolution is long [\#1966](https://github.com/TheHive-Project/TheHive/issues/1966)
+- [Bug] Default analyst rol cant add TTPs [\#1968](https://github.com/TheHive-Project/TheHive/issues/1968)
+- [Bug] Links section should not be empty in Observables details view [\#1972](https://github.com/TheHive-Project/TheHive/issues/1972)
+- [Bug] Deleting a shared rule case for org2 - deleting observables (sharing to org2) from the org1. [\#1973](https://github.com/TheHive-Project/TheHive/issues/1973)
+- [Bug] AddTagToArtifact operation not working in 4.1.3 [\#1974](https://github.com/TheHive-Project/TheHive/issues/1974)
+
 ## [4.1.3](https://github.com/TheHive-Project/TheHive/milestone/72) (2021-04-12)
 
 **Implemented enhancements:**
diff --git a/ScalliGraph b/ScalliGraph
index 78de3a32ac..1a8a32c679 160000
--- a/ScalliGraph
+++ b/ScalliGraph
@@ -1 +1 @@
-Subproject commit 78de3a32ac7d9d09142eff2dd5b4c0d44147067b
+Subproject commit 1a8a32c679a02dc57b59a46cf41c88525f1546c6
diff --git a/build.sbt b/build.sbt
index cf1d470605..97bf2e5b5b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,7 +2,7 @@ import Dependencies._
 import com.typesafe.sbt.packager.Keys.bashScriptDefines
 import org.thp.ghcl.Milestone
 
-val thehiveVersion         = "4.1.3-1"
+val thehiveVersion         = "4.1.4-1"
 val scala212               = "2.12.13"
 val scala213               = "2.13.1"
 val supportedScalaVersions = List(scala212, scala213)
diff --git a/conf/logback.xml b/conf/logback.xml
index d8072baa3e..81ebc5d266 100644
--- a/conf/logback.xml
+++ b/conf/logback.xml
@@ -37,6 +37,7 @@
     <!-- do not set the following logger to TRACE -->
     <logger name="org.thp.scalligraph.traversal" level="INFO"/>
     <logger name="org.reflections8.Reflections" level="ERROR" />
+    <logger name="org.janusgraph.graphdb.database.management.ManagementLogger" level="OFF"/>
     <logger name="org.janusgraph.graphdb.database.IndexSerializer" level="ERROR"/>
 
     <logger name="org.thp.scalligraph.models" level="INFO"/>
diff --git a/frontend/app/scripts/controllers/RootCtrl.js b/frontend/app/scripts/controllers/RootCtrl.js
index 6abb174e2a..f7a82c3edc 100644
--- a/frontend/app/scripts/controllers/RootCtrl.js
+++ b/frontend/app/scripts/controllers/RootCtrl.js
@@ -106,7 +106,6 @@ angular.module('theHiveControllers').controller('RootCtrl',
                     name: 'unread-alert-count'
                 }
             },
-            guard: UtilsSrv.hasAddDeleteEvents,
             onUpdate: function (data) {
                 $scope.unreadAlertCount = data;
             }
diff --git a/frontend/app/scripts/controllers/admin/taxonomy/TaxonomyListCtrl.js b/frontend/app/scripts/controllers/admin/taxonomy/TaxonomyListCtrl.js
index 9ff31b9ae4..f64f83bfcb 100644
--- a/frontend/app/scripts/controllers/admin/taxonomy/TaxonomyListCtrl.js
+++ b/frontend/app/scripts/controllers/admin/taxonomy/TaxonomyListCtrl.js
@@ -6,10 +6,43 @@
         .controller('TaxonomyDialogCtrl', TaxonomyDialogCtrl)
         .controller('TaxonomyImportCtrl', TaxonomyImportCtrl);
 
-    function TaxonomyListCtrl($scope, $uibModal, PaginatedQuerySrv, FilteringSrv, TaxonomySrv, NotificationSrv, ModalSrv, appConfig) {
+    function TaxonomyListCtrl($scope, $uibModal, PaginatedQuerySrv, FilteringSrv, TaxonomySrv, NotificationSrv, ModalSrv, QuerySrv, appConfig) {
         var self = this;
 
         this.appConfig = appConfig;
+        this.allTaxonomyCount = null;
+
+        self.$onInit = function () {
+            self.filtering = new FilteringSrv('taxonomy', 'taxonomy.list', {
+                version: 'v1',
+                defaults: {
+                    showFilters: true,
+                    showStats: false,
+                    pageSize: 15,
+                    sort: ['+namespace']
+                },
+                defaultFilter: []
+            });
+
+            self.filtering.initContext('list')
+                .then(function () {
+                    self.load();
+
+                    $scope.$watch('$vm.list.pageSize', function (newValue) {
+                        self.filtering.setPageSize(newValue);
+                    });
+                });
+
+            QuerySrv.count(
+                'v1',
+                [{ '_name': 'listTaxonomy' }],
+                {
+                    name: 'all-taxonomy'
+                })
+                .then(function (total) {
+                    self.allTaxonomyCount = total;
+                });
+        };
 
         self.load = function () {
             this.loading = true;
@@ -152,27 +185,6 @@
             this.search();
         };
 
-        self.$onInit = function () {
-            self.filtering = new FilteringSrv('taxonomy', 'taxonomy.list', {
-                version: 'v1',
-                defaults: {
-                    showFilters: true,
-                    showStats: false,
-                    pageSize: 15,
-                    sort: ['+namespace']
-                },
-                defaultFilter: []
-            });
-
-            self.filtering.initContext('list')
-                .then(function () {
-                    self.load();
-
-                    $scope.$watch('$vm.list.pageSize', function (newValue) {
-                        self.filtering.setPageSize(newValue);
-                    });
-                });
-        };
     }
 
     function TaxonomyDialogCtrl($uibModalInstance, TaxonomySrv, NotificationSrv, taxonomy) {
diff --git a/frontend/app/scripts/controllers/alert/AlertListCtrl.js b/frontend/app/scripts/controllers/alert/AlertListCtrl.js
index c53e33f3da..ef698f5404 100755
--- a/frontend/app/scripts/controllers/alert/AlertListCtrl.js
+++ b/frontend/app/scripts/controllers/alert/AlertListCtrl.js
@@ -262,11 +262,10 @@
                 self.menu.markAsUnread = temp.length === 1 && temp[0] === true;
 
                 // TODO nadouani: don't rely on alert status
-                self.menu.createNewCase = temp.indexOf('Imported') === -1;
-                self.menu.mergeInCase = temp.indexOf('Imported') === -1;
-
-                temp = _.without(_.uniq(_.pluck(self.selection, 'case')), null, undefined);
+                temp = _.without(_.uniq(_.pluck(self.selection, 'caseId')), null, undefined);
 
+                self.menu.createNewCase = temp.length === 0;
+                self.menu.mergeInCase = temp.length === 0;
                 self.menu.delete = temp.length === 0;
             };
 
diff --git a/frontend/app/scripts/services/api/ProfileSrv.js b/frontend/app/scripts/services/api/ProfileSrv.js
index 3a1becdfac..1523daa2ac 100644
--- a/frontend/app/scripts/services/api/ProfileSrv.js
+++ b/frontend/app/scripts/services/api/ProfileSrv.js
@@ -1,7 +1,7 @@
-(function() {
+(function () {
     'use strict';
     angular.module('theHiveServices')
-        .service('ProfileSrv', function($http) {
+        .service('ProfileSrv', function ($http) {
             var self = this;
             var baseUrl = './api/profile';
 
@@ -46,6 +46,7 @@
                         'manageShare',
                         'manageObservable',
                         'manageTask',
+                        'manageProcedure',
                         'manageAction',
                         'manageAnalyse',
                         'accessTheHiveFS'
@@ -59,6 +60,7 @@
                         manageShare: 'Manage sharing',
                         manageObservable: 'Manage observables',
                         manageTask: 'Manage tasks',
+                        manageProcedure: 'Manage TTPs',
                         manageAction: 'Run Cortex responders',
                         manageAnalyse: 'Run Cortex analyzer',
                         accessTheHiveFS: 'Access to TheHiveFS service'
@@ -66,32 +68,34 @@
                 }
             };
 
-            this.list = function() {
-                return $http.get(baseUrl, {params: {
-                    range: 'all'
-                }});
+            this.list = function () {
+                return $http.get(baseUrl, {
+                    params: {
+                        range: 'all'
+                    }
+                });
             };
 
-            this.get = function(name) {
+            this.get = function (name) {
                 return $http.get(baseUrl + '/' + name);
             };
 
-            this.map = function() {
+            this.map = function () {
                 return self.list()
-                    .then(function(response) {
+                    .then(function (response) {
                         return _.indexBy(response.data, 'name');
                     });
             };
 
-            this.create = function(profile) {
+            this.create = function (profile) {
                 return $http.post(baseUrl, profile);
             };
 
-            this.update = function(id, profile) {
+            this.update = function (id, profile) {
                 return $http.patch(baseUrl + '/' + id, profile);
             };
 
-            this.remove = function(id) {
+            this.remove = function (id) {
                 return $http.delete(baseUrl + '/' + id);
             };
         });
diff --git a/frontend/app/scripts/services/api/TaxonomyCacheSrv.js b/frontend/app/scripts/services/api/TaxonomyCacheSrv.js
index b7d861be36..c3abfe94bc 100644
--- a/frontend/app/scripts/services/api/TaxonomyCacheSrv.js
+++ b/frontend/app/scripts/services/api/TaxonomyCacheSrv.js
@@ -11,11 +11,12 @@
                 return QuerySrv.call('v1', [
                     { _name: 'listTaxonomy' }
                 ], {
-                    name: 'list-taxonomies'
-                }, {
-                    name: 'filter',
-                    _field: 'enabled',
-                    _value: true
+                    name: 'list-taxonomies-cache',
+                    filter: {
+                        name: 'filter',
+                        _field: 'enabled',
+                        _value: true
+                    }
                 });
             };
 
diff --git a/frontend/app/views/partials/admin/taxonomy/list.html b/frontend/app/views/partials/admin/taxonomy/list.html
index f8aa93d385..240e44ef53 100644
--- a/frontend/app/views/partials/admin/taxonomy/list.html
+++ b/frontend/app/views/partials/admin/taxonomy/list.html
@@ -2,18 +2,20 @@
     <div class="col-md-12">
         <div class="box">
             <div class="box-header with-border">
-                <h3 class="box-title">List of taxonomies</h3>
+                <!-- <h3 class="box-title">List of taxonomies</h3> -->
+                <datalist-header title="List of taxonomies" list="$vm.list" total="$vm.allTaxonomyCount">
+                </datalist-header>
             </div>
             <div class="box-body">
                 <div ng-include="'views/partials/admin/taxonomy/list/toolbar.html'"></div>
 
-                <div class="mt-xs filter-panel" ng-include="'views/partials/admin/taxonomy/list/filters.html'" ng-show="$vm.filtering.context.showFilters"></div>
+                <div class="mt-xs filter-panel" ng-include="'views/partials/admin/taxonomy/list/filters.html'"
+                    ng-show="$vm.filtering.context.showFilters"></div>
 
                 <div class="row mt-xs">
                     <div class="col-md-12 clearfix">
 
-                        <filters-preview filters="$vm.filtering.context.filters"
-                            on-clear-item="$vm.removeFilter(field)"
+                        <filters-preview filters="$vm.filtering.context.filters" on-clear-item="$vm.removeFilter(field)"
                             on-clear-all="$vm.clearFilters()"></filters-preview>
                     </div>
                 </div>
@@ -52,7 +54,8 @@ <h3 class="box-title">List of taxonomies</h3>
                             <tbody>
                                 <tr ng-repeat="taxonomy in $vm.list.values">
                                     <td>
-                                        <span class="clickable" ng-click="$vm.addFilterValue('enabled', !!taxonomy.extraData.enabled)">
+                                        <span class="clickable"
+                                            ng-click="$vm.addFilterValue('enabled', !!taxonomy.extraData.enabled)">
                                             <i class="fa" ng-class="{
                                                     true: 'text-tlp-green fa-circle',
                                                     false: 'text-tlp-red fa-circle',
@@ -75,7 +78,7 @@ <h3 class="box-title">List of taxonomies</h3>
                                     </td>
                                     <td class="clearfix">
                                         <div class="pull-right">
-                                            <a class="btn btn-icon btn-clear" href  ng-click="$vm.toggleActive(taxonomy)"
+                                            <a class="btn btn-icon btn-clear" href ng-click="$vm.toggleActive(taxonomy)"
                                                 uib-tooltip="{{!!taxonomy.extraData.enabled ? 'Disable taxonomy' : 'Enable taxonomy'}}">
 
                                                 <i class="fa" ng-class="{
@@ -84,11 +87,13 @@ <h3 class="box-title">List of taxonomies</h3>
                                                 }[!!taxonomy.extraData.enabled]"></i>
                                             </a>
 
-                                            <a class="btn btn-icon btn-clear" href  ng-click="$vm.show(taxonomy)" uib-tooltip="Edit taxonomy">
+                                            <a class="btn btn-icon btn-clear" href ng-click="$vm.show(taxonomy)"
+                                                uib-tooltip="Edit taxonomy">
                                                 <i class="text-primary fa fa-search"></i>
                                             </a>
 
-                                            <a class="btn btn-icon btn-clear" href  ng-click="$vm.remove(taxonomy)" uib-tooltip="Delete taxonomy">
+                                            <a class="btn btn-icon btn-clear" href ng-click="$vm.remove(taxonomy)"
+                                                uib-tooltip="Delete taxonomy">
                                                 <i class="text-danger fa fa-trash"></i>
                                             </a>
                                         </div>
diff --git a/frontend/app/views/partials/alert/event.dialog.html b/frontend/app/views/partials/alert/event.dialog.html
index d5e950e1f9..64c2171363 100644
--- a/frontend/app/views/partials/alert/event.dialog.html
+++ b/frontend/app/views/partials/alert/event.dialog.html
@@ -1,6 +1,7 @@
 <div class="modal-header bg-primary">
     <h3 class="modal-title">
-      Alert Preview <span class="label label-default" ng-class="{'label-danger': !!!dialog.event.read}">{{dialog.event.caseId ? 'Imported' : 'New'}}</span>
+        Alert Preview <span class="label label-default"
+            ng-class="{'label-danger': !!!dialog.event.read}">{{dialog.event.caseId ? 'Imported' : 'New'}}</span>
     </h3>
 </div>
 <div class="modal-body">
@@ -20,7 +21,8 @@ <h4 class="text-primary">
                 <div class="mt-xxs">
                     <span>
                         <strong><i class="fa fa-copy"></i> ID: </strong>
-                        <span class="clickable"><a ng-click="dialog.copyId(dialog.event._id)">{{dialog.event._id}}</a></span>
+                        <span class="clickable"><a
+                                ng-click="dialog.copyId(dialog.event._id)">{{dialog.event._id}}</a></span>
                     </span>
                     <span class="ml-xxs">
                         <strong><i class="fa fa-calendar"></i> Date: </strong>
@@ -41,7 +43,8 @@ <h4 class="text-primary">
                 </div>
                 <div class="case-tags flexwrap mt-xxs">
                     <strong><i class="fa fa-tags mr-xxxs"></i></strong>
-                    <strong class="text-muted mr-xxxs" ng-if="!dialog.event.tags || dialog.event.tags.length === 0">None</strong>
+                    <strong class="text-muted mr-xxxs"
+                        ng-if="!dialog.event.tags || dialog.event.tags.length === 0">None</strong>
                     <tag-item ng-repeat="tag in dialog.event.tags track by $index" value="tag"></tag-item>
                 </div>
 
@@ -89,7 +92,8 @@ <h4 class="vpad10 text-primary">
                         </span>
                     </uib-tab-heading>
                     <div>
-                        <alert-observable-list alert-id="dialog.eventId" on-list-load="dialog.updateObservableCount(count)"></alert-observable-list>
+                        <alert-observable-list alert-id="dialog.eventId"
+                            on-list-load="dialog.updateObservableCount(count)"></alert-observable-list>
                     </div>
                 </uib-tab>
                 <uib-tab index="1">
@@ -116,40 +120,46 @@ <h4 class="vpad10 text-primary">
 
 
 
-    <button class="btn btn-default" type="button"
-        ng-if="dialog.canMarkAsRead(dialog.event) && !dialog.readonly"
-        ng-disabled="dialog.loading"
-        ng-click="dialog.markAsRead(dialog.event)">
+    <button class="btn btn-default" type="button" ng-if="dialog.canMarkAsRead(dialog.event) && !dialog.readonly"
+        ng-disabled="dialog.loading" ng-click="dialog.markAsRead(dialog.event)">
         <i class="fa fa-envelope"></i> Mark as read
     </button>
-    <button class="btn btn-default" type="button"
-        ng-if="dialog.canMarkAsUnread(dialog.event) && !dialog.readonly"
-        ng-disabled="dialog.loading"
-        ng-click="dialog.markAsRead(dialog.event)">
+    <button class="btn btn-default" type="button" ng-if="dialog.canMarkAsUnread(dialog.event) && !dialog.readonly"
+        ng-disabled="dialog.loading" ng-click="dialog.markAsRead(dialog.event)">
         <i class="fa fa-envelope-open-o"></i> Mark as unread
     </button>
 
-    <button class="btn btn-default" type="button" ng-if="!dialog.readonly" ng-disabled="dialog.loading" ng-click="dialog.follow()">
-        <i class="fa" ng-class="{'fa-eye': dialog.event.follow, 'fa-eye-slash': !dialog.event.follow}"></i> {{dialog.event.follow ? 'Ignore new updates' : 'Track new updates'}}
+    <button class="btn btn-default" type="button" ng-if="!dialog.readonly" ng-disabled="dialog.loading"
+        ng-click="dialog.follow()">
+        <i class="fa" ng-class="{'fa-eye': dialog.event.follow, 'fa-eye-slash': !dialog.event.follow}"></i>
+        {{dialog.event.follow ? 'Ignore new updates' : 'Track new updates'}}
     </button>
 
-    <button class="btn btn-default" type="button" ng-if="!dialog.readonly" ng-disabled="dialog.loading" ng-click="dialog.merge()">
+    <button class="btn btn-default" type="button" ng-if="!dialog.readonly" ng-disabled="dialog.loading"
+        ng-click="dialog.merge()">
         <i class="fa fa-compress"></i> Merge into case
     </button>
 
-    <button ng-if="!dialog.readonly" class="btn btn-danger" type="button" ng-disabled="dialog.loading" ng-click="dialog.delete()">
+    <button ng-if="!dialog.readonly" class="btn btn-danger" type="button" ng-disabled="dialog.loading"
+        ng-click="dialog.delete()">
         <i class="fa fa-trash"></i> Delete
     </button>
 
-    <form ng-if="!dialog.readonly" name="eventForm" class="form-horizontal pull-right mr-xs" style="width:450px;" ng-submit="dialog.import()">
+    <form ng-if="!dialog.readonly" name="eventForm" class="form-horizontal pull-right mr-xs" style="width:450px;"
+        ng-submit="dialog.import()">
         <div class="form-group">
             <label class="col-sm-4 control-label">Import alert as</label>
             <div class="col-sm-8 input-group">
-                <select class="form-control" ng-model="dialog.event.caseTemplate" ng-options="template for template in dialog.templates">
-                    <option value="" ng-if="dialog.templates.length === 0 || !!!dialog.hideEmptyCaseButton">Empty case</option>
+                <select class="form-control" ng-model="dialog.event.caseTemplate"
+                    ng-options="template for template in dialog.templates | orderBy:displayName | orderBy:name">
+                    <option value="" ng-if="dialog.templates.length === 0 || !!!dialog.hideEmptyCaseButton">-- Empty
+                        case --
+                    </option>
                 </select>
                 <span class="input-group-btn">
-                    <button class="btn btn-primary" type="submit" ng-disabled="dialog.loading || (!dialog.event.caseTemplate && !!dialog.hideEmptyCaseButton && dialog.templates.length > 0)"><i class="fa fa-download"></i> Yes, Import</button>
+                    <button class="btn btn-primary" type="submit"
+                        ng-disabled="dialog.loading || (!dialog.event.caseTemplate && !!dialog.hideEmptyCaseButton && dialog.templates.length > 0)"><i
+                            class="fa fa-download"></i> Yes, Import</button>
                 </span>
             </div>
 
diff --git a/frontend/app/views/partials/case/case.alerts.html b/frontend/app/views/partials/case/case.alerts.html
index 590976743b..2da03ea95b 100644
--- a/frontend/app/views/partials/case/case.alerts.html
+++ b/frontend/app/views/partials/case/case.alerts.html
@@ -4,21 +4,19 @@
     </div>
 </div>
 
-<div class="case-links" ng-show="alerts.length > 0" ng-init="filteredLinks = (alerts | filter:filtering | orderBy:sorting.field)">
+<div class="case-links" ng-show="alerts.length > 0"
+    ng-init="filteredLinks = (alerts | filter:filtering | orderBy:sorting.field)">
     <div class="mv-s" ng-if="alertStats">
-        <span class="label label-lg label-default mr-xxs clickable"
-            ng-click="filterBy('');"
+        <span class="label label-lg label-default mr-xxs clickable" ng-click="filterBy('');"
             ng-class="{'label-primary': currentFilter===''}">All ({{alerts.length || 0}})</span>
 
         <span><strong>Type:</strong></span>
-        <span class="label label-lg label-default mr-xxs clickable"
-            ng-repeat="statsItem in alertStats.type"
+        <span class="label label-lg label-default mr-xxs clickable" ng-repeat="statsItem in alertStats.type"
             ng-click="filterBy('type', statsItem.key)"
             ng-class="{'label-primary': currentFilter===statsItem.key}">{{statsItem.key}} ({{statsItem.value}})</span>
 
         <span><strong>Source:</strong></span>
-        <span class="label label-lg label-default mr-xxs clickable"
-            ng-repeat="statsItem in alertStats.source"
+        <span class="label label-lg label-default mr-xxs clickable" ng-repeat="statsItem in alertStats.source"
             ng-click="filterBy('source', statsItem.key)"
             ng-class="{'label-primary': currentFilter===statsItem.key}">{{statsItem.key}} ({{statsItem.value}})</span>
     </div>
@@ -33,55 +31,57 @@
         <thead>
             <tr>
                 <th width="150px">
-                  <a href class="text-default" ng-click="sortBy('sourceRef')">
-                    Reference
-                    <i ng-show="sorting.field !== '+sourceRef' && sorting.field !== '-sourceRef'" class="fa fa-sort"></i>
-                    <i ng-show="sorting.field === '+sourceRef'" class="fa fa-caret-up"></i>
-                    <i ng-show="sorting.field === '-sourceRef'" class="fa fa-caret-down"></i>
-                  </a>
+                    <a href class="text-default" ng-click="sortBy('sourceRef')">
+                        Reference
+                        <i ng-show="sorting.field !== '+sourceRef' && sorting.field !== '-sourceRef'"
+                            class="fa fa-sort"></i>
+                        <i ng-show="sorting.field === '+sourceRef'" class="fa fa-caret-up"></i>
+                        <i ng-show="sorting.field === '-sourceRef'" class="fa fa-caret-down"></i>
+                    </a>
                 </th>
                 <th width="160px">
-                  <a href class="text-default" ng-click="sortBy('type')">
-                    Type
-                    <i ng-show="sorting.field !== '+type' && sorting.field !== '-type'" class="fa fa-sort"></i>
-                    <i ng-show="sorting.field === '+type'" class="fa fa-caret-up"></i>
-                    <i ng-show="sorting.field === '-type'" class="fa fa-caret-down"></i>
-                  </a>
+                    <a href class="text-default" ng-click="sortBy('type')">
+                        Type
+                        <i ng-show="sorting.field !== '+type' && sorting.field !== '-type'" class="fa fa-sort"></i>
+                        <i ng-show="sorting.field === '+type'" class="fa fa-caret-up"></i>
+                        <i ng-show="sorting.field === '-type'" class="fa fa-caret-down"></i>
+                    </a>
                 </th>
                 <th>
-                  <a href class="text-default" ng-click="sortBy('title')">
-                    Title
-                    <i ng-show="sorting.field !== '+title' && sorting.field !== '-title'" class="fa fa-sort"></i>
-                    <i ng-show="sorting.field === '+title'" class="fa fa-caret-up"></i>
-                    <i ng-show="sorting.field === '-title'" class="fa fa-caret-down"></i>
-                  </a>
+                    <a href class="text-default" ng-click="sortBy('title')">
+                        Title
+                        <i ng-show="sorting.field !== '+title' && sorting.field !== '-title'" class="fa fa-sort"></i>
+                        <i ng-show="sorting.field === '+title'" class="fa fa-caret-up"></i>
+                        <i ng-show="sorting.field === '-title'" class="fa fa-caret-down"></i>
+                    </a>
                 </th>
                 <th width="150px">
-                  <a href class="text-default" ng-click="sortBy('source')">
-                    Source
-                    <i ng-show="sorting.field !== '+source' && sorting.field !== '-source'" class="fa fa-sort"></i>
-                    <i ng-show="sorting.field === '+source'" class="fa fa-caret-up"></i>
-                    <i ng-show="sorting.field === '-source'" class="fa fa-caret-down"></i>
-                  </a>
+                    <a href class="text-default" ng-click="sortBy('source')">
+                        Source
+                        <i ng-show="sorting.field !== '+source' && sorting.field !== '-source'" class="fa fa-sort"></i>
+                        <i ng-show="sorting.field === '+source'" class="fa fa-caret-up"></i>
+                        <i ng-show="sorting.field === '-source'" class="fa fa-caret-down"></i>
+                    </a>
                 </th>
                 <th width="80px">
-                  <a href class="text-default" ng-click="sortBy('severity')">
-                    Severity
-                    <i ng-show="sorting.field !== '+severity' && sorting.field !== '-severity'" class="fa fa-sort"></i>
-                    <i ng-show="sorting.field === '+severity'" class="fa fa-caret-up"></i>
-                    <i ng-show="sorting.field === '-severity'" class="fa fa-caret-down"></i>
-                  </a>
+                    <a href class="text-default" ng-click="sortBy('severity')">
+                        Severity
+                        <i ng-show="sorting.field !== '+severity' && sorting.field !== '-severity'"
+                            class="fa fa-sort"></i>
+                        <i ng-show="sorting.field === '+severity'" class="fa fa-caret-up"></i>
+                        <i ng-show="sorting.field === '-severity'" class="fa fa-caret-down"></i>
+                    </a>
                 </th>
                 <th width="80px">
-                  Attributes
+                    Attributes
                 </th>
                 <th style="width: 160px">
-                  <a href class="text-default" ng-click="sortBy('date')">
-                    Date
-                    <i ng-show="sorting.field !== '+date' && sorting.field !== '-date'" class="fa fa-sort"></i>
-                    <i ng-show="sorting.field === '+date'" class="fa fa-caret-up"></i>
-                    <i ng-show="sorting.field === '-date'" class="fa fa-caret-down"></i>
-                  </a>
+                    <a href class="text-default" ng-click="sortBy('date')">
+                        Date
+                        <i ng-show="sorting.field !== '+date' && sorting.field !== '-date'" class="fa fa-sort"></i>
+                        <i ng-show="sorting.field === '+date'" class="fa fa-caret-up"></i>
+                        <i ng-show="sorting.field === '-date'" class="fa fa-caret-down"></i>
+                    </a>
                 </th>
                 <th style="width: 60px"></th>
             </tr>
@@ -112,7 +112,7 @@
                         <severity active="false" value="event.severity"></severity>
                     </div>
                 </td>
-                <td class="text-center">{{::event.artifacts.length || 0}}</td>
+                <td class="text-center">{{::event.observableCount || 0}}</td>
                 <td>{{event.date | shortDate}}</td>
                 <td>
                     <a class="btn btn-xs btn-icon btn-clear" href ng-click="previewEvent(event)" uib-tooltip="Preview">
@@ -125,14 +125,16 @@
                     <div class="case-tags flexwrap">
                         <span class="mr-xxxs text-muted"><i class="fa fa-tags"></i></span>
                         <strong class="text-muted mr-xxxs" ng-if="!event.tags || event.tags.length === 0">None</strong>
-                        <span ng-repeat="tag in event.tags track by $index" class="label label-primary mb-xxxs mr-xxxs pointer">{{tag}}</span>
+                        <span ng-repeat="tag in event.tags track by $index"
+                            class="label label-primary mb-xxxs mr-xxxs pointer">{{tag}}</span>
                     </div>
                 </td>
                 <td></td>
             </tr>
             <tr>
                 <td colspan="7">
-                    <custom-field-labels custom-fields="event.customFields"><custom-field-labels>
+                    <custom-field-labels custom-fields="event.customFields">
+                        <custom-field-labels>
                 </td>
                 <td></td>
             </tr>
diff --git a/frontend/app/views/partials/case/case.procedures.html b/frontend/app/views/partials/case/case.procedures.html
index 27a86a1415..37198179e4 100644
--- a/frontend/app/views/partials/case/case.procedures.html
+++ b/frontend/app/views/partials/case/case.procedures.html
@@ -1,6 +1,7 @@
 <div ng-include="'views/partials/case/procedures/toolbar.html'"></div>
 
-<div class="mt-xs filter-panel" ng-include="'views/partials/case/procedures/filters.html'" ng-show="$vm.filtering.context.showFilters"></div>
+<div class="mt-xs filter-panel" ng-include="'views/partials/case/procedures/filters.html'"
+    ng-show="$vm.filtering.context.showFilters"></div>
 
 <!-- Filters preview  -->
 <div class="row mt-xs">
@@ -11,7 +12,8 @@ <h4>
             </h4>
         </div>
 
-        <filters-preview filters="$vm.filtering.context.filters" on-clear-item="$vm.removeFilter(field)" on-clear-all="$vm.clearFilters()"></filters-preview>
+        <filters-preview filters="$vm.filtering.context.filters" on-clear-item="$vm.removeFilter(field)"
+            on-clear-all="$vm.clearFilters()"></filters-preview>
     </div>
 </div>
 
@@ -28,7 +30,8 @@ <h4>
             <div class="ttp-tactic">
                 <a href class="text-default" ng-click="$vm.sortByField('tactic')">
                     Tactic
-                    <i ng-show="$vm.filtering.context.sort.indexOf('+tactic') === -1 && $vm.filtering.context.sort.indexOf('-tactic') === -1" class="fa fa-sort"></i>
+                    <i ng-show="$vm.filtering.context.sort.indexOf('+tactic') === -1 && $vm.filtering.context.sort.indexOf('-tactic') === -1"
+                        class="fa fa-sort"></i>
                     <i ng-show="$vm.filtering.context.sort.indexOf('+tactic') !== -1" class="fa fa-caret-up"></i>
                     <i ng-show="$vm.filtering.context.sort.indexOf('-tactic') !== -1" class="fa fa-caret-down"></i>
                 </a>
@@ -36,7 +39,8 @@ <h4>
             <div class="ttp-name">
                 <a href class="text-default" ng-click="$vm.sortByField('patternId')">
                     Technique
-                    <i ng-show="$vm.filtering.context.sort.indexOf('+patternId') === -1 && $vm.filtering.context.sort.indexOf('-patternId') === -1" class="fa fa-sort"></i>
+                    <i ng-show="$vm.filtering.context.sort.indexOf('+patternId') === -1 && $vm.filtering.context.sort.indexOf('-patternId') === -1"
+                        class="fa fa-sort"></i>
                     <i ng-show="$vm.filtering.context.sort.indexOf('+patternId') !== -1" class="fa fa-caret-up"></i>
                     <i ng-show="$vm.filtering.context.sort.indexOf('-patternId') !== -1" class="fa fa-caret-down"></i>
                 </a>
@@ -45,7 +49,8 @@ <h4>
             <div class="ttp-date">
                 <a href class="text-default" ng-click="$vm.sortByField('occurDate')">
                     Occur Date
-                    <i ng-show="$vm.filtering.context.sort.indexOf('+occurDate') === -1 && $vm.filtering.context.sort.indexOf('-occurDate') === -1" class="fa fa-sort"></i>
+                    <i ng-show="$vm.filtering.context.sort.indexOf('+occurDate') === -1 && $vm.filtering.context.sort.indexOf('-occurDate') === -1"
+                        class="fa fa-sort"></i>
                     <i ng-show="$vm.filtering.context.sort.indexOf('+occurDate') !== -1" class="fa fa-caret-up"></i>
                     <i ng-show="$vm.filtering.context.sort.indexOf('-occurDate') !== -1" class="fa fa-caret-down"></i>
                 </a>
@@ -55,29 +60,36 @@ <h4>
 
         <div class="ttp-item" ng-repeat="proc in $vm.list.values">
             <div class="ttp-header">
-                <div class="ttp-tactic clickable" ng-click="$vm.expanded[proc._id] = !$vm.expanded[proc._id]" style="border-color: {{$vm.tactics[proc.tactic].color}}">
+                <div class="ttp-tactic clickable" ng-click="$vm.expanded[proc._id] = !$vm.expanded[proc._id]"
+                    style="border-color: {{$vm.tactics[proc.tactic].color}}">
                     <div>
                         <a class="mr-xxs">
-                            <i class="fa" ng-class="{true: 'fa-chevron-up', false: 'fa-chevron-down'}[!!$vm.expanded[proc._id]]"></i>
+                            <i class="fa"
+                                ng-class="{true: 'fa-chevron-up', false: 'fa-chevron-down'}[!!$vm.expanded[proc._id]]"></i>
                         </a>
 
                         {{$vm.tactics[proc.tactic].label}}
 
-                        <a href class="pull-right" ng-click="$vm.addFilterValue('tactic', proc.tactic)"><i class="fa fa-filter"></i></a>
+                        <a href class="pull-right" ng-click="$vm.addFilterValue('tactic', proc.tactic)"><i
+                                class="fa fa-filter"></i></a>
                     </div>
                 </div>
                 <div class="ttp-name" ng-if="proc.extraData.patternParent">
                     <div>
-                        <a href ng-click="$vm.showPattern(proc.patternId)">{{proc.patternId}}</a> - {{proc.extraData.patternParent.name}}:{{proc.extraData.pattern.name}}
+                        <a href ng-click="$vm.showPattern(proc.patternId)">{{proc.patternId}}</a> -
+                        {{proc.extraData.patternParent.name}}:{{proc.extraData.pattern.name}}
 
-                        <a href class="pull-right" ng-click="$vm.addFilterValue('patternId', proc.patternId)"><i class="fa fa-filter"></i></a>
+                        <a href class="pull-right" ng-click="$vm.addFilterValue('patternId', proc.patternId)"><i
+                                class="fa fa-filter"></i></a>
                     </div>
                 </div>
                 <div class="ttp-name" ng-if="!proc.extraData.patternParent">
                     <div>
-                        <a href ng-click="$vm.showPattern(proc.patternId)">{{proc.patternId}}</a> - {{proc.extraData.pattern.name}}
+                        <a href ng-click="$vm.showPattern(proc.patternId)">{{proc.patternId}}</a> -
+                        {{proc.extraData.pattern.name}}
 
-                        <a href class="pull-right" ng-click="$vm.addFilterValue('patternId', proc.patternId)"><i class="fa fa-filter"></i></a>
+                        <a href class="pull-right" ng-click="$vm.addFilterValue('patternId', proc.patternId)"><i
+                                class="fa fa-filter"></i></a>
                     </div>
                 </div>
 
@@ -86,11 +98,13 @@ <h4>
                 </div> -->
                 <div class="ttp-date">
                     <a href ng-click="$vm.addFilterValue('occurDate', proc.occurDate)">
-                        <span uib-tooltip="{{proc.occurDate | shortDate}}" tooltip-popup-delay="500" tooltip-placement="bottom">{{proc.occurDate | shortDate}}</span>
+                        <span uib-tooltip="{{proc.occurDate | shortDate}}" tooltip-popup-delay="500"
+                            tooltip-placement="bottom">{{proc.occurDate | shortDate}}</span>
                     </a>
                 </div>
                 <div class="ttp-action">
-                    <a class="btn btn-icon btn-clear text-danger" href ng-click="$vm.remove(proc)" uib-tooltip="Delete TTP" if-permission="manageCase" allowed="{{userPermissions}}">
+                    <a class="btn btn-icon btn-clear text-danger" href ng-click="$vm.remove(proc)"
+                        uib-tooltip="Delete TTP" if-permission="manageProcedure" allowed="{{userPermissions}}">
                         <i class="fa fa-trash"></i>
                     </a>
                 </div>
@@ -100,35 +114,44 @@ <h4>
                     <div class="col-sm-3">
                         <label>Created By</label>
                         <div>
-                            <user-info value="proc._createdBy" field="organisation"></user-info>/<user-info value="proc._createdBy" field="name"></user-info>
+                            <user-info value="proc._createdBy" field="organisation"></user-info>/<user-info
+                                value="proc._createdBy" field="name"></user-info>
                         </div>
                     </div>
                     <div class="col-sm-3">
                         <label>Created At</label>
                         <div>
-                            <span uib-tooltip="{{proc._createdAt | shortDate}}" tooltip-popup-delay="500" tooltip-placement="bottom">{{proc._createdAt | shortDate}}</span>
+                            <span>{{proc._createdAt | shortDate}}</span>
                         </div>
                     </div>
                     <div class="col-sm-3">
                         <label>Updated At</label>
                         <div>
-                            <span uib-tooltip="{{proc._updatedAt | shortDate}}" tooltip-popup-delay="500" tooltip-placement="bottom">{{(proc._updatedAt | shortDate) || '-'}}</span>
+                            <span>{{(proc._updatedAt | shortDate) || '-'}}</span>
                         </div>
                     </div>
                     <div class="col-sm-3">
                         <label>Occured At</label>
-                        <div>
-                            <updatable-date on-update="$vm.updateField(proc, 'occurDate', true)" value="proc.occurDate" clearable="false"></updatable-date>
+                        <div if-permission="manageProcedure" allowed="{{userPermissions}}">
+                            <updatable-date on-update="$vm.updateField(proc, 'occurDate', true)" value="proc.occurDate"
+                                clearable="false"></updatable-date>
+                        </div>
+                        <div class="description-pane" if-not-permission="manageProcedure" allowed="{{userPermissions}}">
+                            <span>{{(proc.occurDate | shortDate) || '-'}}</span>
                         </div>
                     </div>
                 </div>
                 <div class="row">
                     <div class="col-sm-12">
                         <label>Procedure</label>
-                        <div class="description-pane" if-permission="manageCase" allowed="{{userPermissions}}">
-                            <updatable-text on-update="$vm.updateField(proc, 'description')" value="proc.description"></updatable-text>
+                        <div class="description-pane" if-permission="manageProcedure" allowed="{{userPermissions}}">
+                            <updatable-text on-update="$vm.updateField(proc, 'description')" value="proc.description">
+                            </updatable-text>
                         </div>
-                        <div class="description-pane" if-not-permission="manageCase" allowed="{{userPermissions}}">
+                        <div class="description-pane" if-not-permission="manageProcedure" allowed="{{userPermissions}}">
+                            <div ng-if="!proc.description">
+                                <em class="text-warning">Not Specified</em>
+                            </div>
                             <div marked="proc.description" class="markdown"></div>
                         </div>
                     </div>
diff --git a/frontend/app/views/partials/case/procedures/toolbar.html b/frontend/app/views/partials/case/procedures/toolbar.html
index 5cf4cdb69c..763089d138 100644
--- a/frontend/app/views/partials/case/procedures/toolbar.html
+++ b/frontend/app/views/partials/case/procedures/toolbar.html
@@ -2,7 +2,7 @@
     <div class="col-md-12">
         <div class="btn-toolbar" role="toolbar">
 
-            <div class="btn-group" if-permission="manageCase" allowed="{{userPermissions}}">
+            <div class="btn-group" if-permission="manageProcedure" allowed="{{userPermissions}}">
                 <button class="btn btn-sm btn-primary" ng-click="$vm.addProcedure()">
                     <i class="glyphicon glyphicon-plus"></i>
                     Add TTP
@@ -36,7 +36,9 @@
             </div>
 
             <div class="btn-group pull-right" role="group">
-                <button class="btn btn-sm" ng-class="{true: 'btn-primary', false:'btn-default'}[$vm.filtering.context.showFilters]" type="button" ng-click="$vm.toggleFilters()">
+                <button class="btn btn-sm"
+                    ng-class="{true: 'btn-primary', false:'btn-default'}[$vm.filtering.context.showFilters]"
+                    type="button" ng-click="$vm.toggleFilters()">
                     <i class="fa fa-search"></i> Filters
                 </button>
             </div>
diff --git a/frontend/bower.json b/frontend/bower.json
index 8e590b49d3..3725157055 100644
--- a/frontend/bower.json
+++ b/frontend/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "thehive",
-  "version": "4.1.3-1",
+  "version": "4.1.4-1",
   "license": "AGPL-3.0",
   "dependencies": {
     "jquery": "^3.4.1",
diff --git a/frontend/package.json b/frontend/package.json
index 56d225c3b1..652c7464c0 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
     "name": "thehive",
-    "version": "4.1.3-1",
+    "version": "4.1.4-1",
     "license": "AGPL-3.0",
     "repository": {
         "type": "git",
diff --git a/package/logback.xml b/package/logback.xml
index ae905cd3d9..bf16f2bb5e 100644
--- a/package/logback.xml
+++ b/package/logback.xml
@@ -37,6 +37,7 @@
     <!-- do not set the following logger to TRACE -->
     <logger name="org.thp.scalligraph.traversal" level="INFO"/>
     <logger name="org.reflections8.Reflections" level="ERROR" />
+    <logger name="org.janusgraph.graphdb.database.management.ManagementLogger" level="OFF"/>
     <logger name="org.janusgraph.graphdb.database.IndexSerializer" level="ERROR"/>
 
     <logger name="org.thp" level="INFO"/>
diff --git a/thehive/app/org/thp/thehive/controllers/v0/AlertCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/AlertCtrl.scala
index 33e6294d49..076d7746fe 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/AlertCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/AlertCtrl.scala
@@ -468,9 +468,7 @@ class PublicAlert @Inject() (
       .property("user", UMapping.string)(_.field.updatable)
       .property("customFields", UMapping.jsonNative)(_.subSelect {
         case (FPathElem(_, FPathElem(idOrName, _)), alerts) =>
-          alerts
-            .customFields(EntityIdOrName(idOrName))
-            .jsonValue
+          alerts.customFieldJsonValue(customFieldSrv, EntityIdOrName(idOrName))
         case (_, alerts) => alerts.customFields.nameJsonValue.fold.domainMap(JsObject(_))
       }
         .filter[JsValue] {
diff --git a/thehive/app/org/thp/thehive/controllers/v1/AdminCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/AdminCtrl.scala
index 77ca67817b..21637a1986 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/AdminCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/AdminCtrl.scala
@@ -117,7 +117,15 @@ class AdminCtrl @Inject() (
     entrypoint("Get index status")
       .authPermittedRoTransaction(db, Permissions.managePlatform) { _ => graph =>
         val indices = labels.map { label =>
-          Json.obj("name" -> label, "count" -> graph.indexCountQuery(s"""v."_label":$label"""))
+          val count =
+            try graph.indexCountQuery(s"""v."_label":$label""")
+            catch {
+              case error: Throwable =>
+                logger.error("Index fetch error", error)
+                0
+            }
+          Json.obj("name" -> label, "count" -> count)
+
         }
         val indexCount = Json.obj("name" -> "global", "indices" -> indices)
         Success(Results.Ok(Json.obj("index" -> Seq(indexCount))))
diff --git a/thehive/app/org/thp/thehive/models/Observable.scala b/thehive/app/org/thp/thehive/models/Observable.scala
index 158c1de33e..b0a92a85e8 100644
--- a/thehive/app/org/thp/thehive/models/Observable.scala
+++ b/thehive/app/org/thp/thehive/models/Observable.scala
@@ -66,6 +66,6 @@ case class RichObservable(
   def tags: Seq[String]                                        = observable.tags
 }
 
-@DefineIndex(IndexType.unique, "data")
+@DefineIndex(IndexType.standard, "data")
 @BuildVertexEntity
 case class Data(data: String)
diff --git a/thehive/app/org/thp/thehive/models/Role.scala b/thehive/app/org/thp/thehive/models/Role.scala
index 996b9709bd..953974dce6 100644
--- a/thehive/app/org/thp/thehive/models/Role.scala
+++ b/thehive/app/org/thp/thehive/models/Role.scala
@@ -27,7 +27,8 @@ object Profile {
       Permissions.manageShare,
       Permissions.manageAnalyse,
       Permissions.managePage,
-      Permissions.accessTheHiveFS
+      Permissions.accessTheHiveFS,
+      Permissions.manageProcedure
     )
   )
   val readonly: Profile           = Profile("read-only", Set.empty)
diff --git a/thehive/app/org/thp/thehive/models/TheHiveSchemaDefinition.scala b/thehive/app/org/thp/thehive/models/TheHiveSchemaDefinition.scala
index 0763d4397e..8b5ce6c2e4 100644
--- a/thehive/app/org/thp/thehive/models/TheHiveSchemaDefinition.scala
+++ b/thehive/app/org/thp/thehive/models/TheHiveSchemaDefinition.scala
@@ -184,14 +184,15 @@ class TheHiveSchemaDefinition @Inject() extends Schema with UpdatableSchema {
       traversal.unsafeHas("name", "admin").raw.property("permissions", "managePattern").iterate()
       Success(())
     }
-    .updateGraph("Add manageProcedure permission to org-admin and analyst profiles", "Profile") { traversal =>
-      traversal
-        .unsafeHas("name", P.within("org-admin", "analyst"))
-        .raw
-        .property("permissions", "manageProcedure")
-        .iterate()
-      Success(())
-    }
+    .noop
+//    .updateGraph("Add manageProcedure permission to org-admin and analyst profiles", "Profile") { traversal =>
+//      traversal
+//        .unsafeHas("name", P.within("org-admin", "analyst"))
+//        .raw
+//        .property("permissions", "manageProcedure")
+//        .iterate()
+//      Success(())
+//    }
     // Index backend
     /* Alert index  */
     .addProperty[Seq[String]]("Alert", "tags")
@@ -266,7 +267,7 @@ class TheHiveSchemaDefinition @Inject() extends Schema with UpdatableSchema {
     }
     /* CaseTemplate index  */
     .addProperty[Seq[String]]("CaseTemplate", "tags")
-    .updateGraph("Add tags in caseTempates", "CaseTemplate") { traversal =>
+    .updateGraph("Add tags in caseTemplates", "CaseTemplate") { traversal =>
       traversal
         .project(
           _.by
@@ -469,7 +470,22 @@ class TheHiveSchemaDefinition @Inject() extends Schema with UpdatableSchema {
     .removeIndex("Observable", IndexType.standard)
     .removeIndex("Tag", IndexType.standard)
     .removeIndex("Task", IndexType.standard)
-  //=====[release 4.1.3]=====
+    //=====[release 4.1.3]=====
+    .dbOperation[JanusDatabase]("Remove global index if ElasticSearch is used") { db =>
+      db.managementTransaction(mgmt => Try(mgmt.get("index.search.backend"))).flatMap {
+        case "elasticsearch" => db.removeIndex("global", IndexType.fulltext, Nil)
+        case _               => Success(())
+      }
+    }
+    .updateGraph("Add manageProcedure permission to org-admin and analyst profiles", "Profile") { traversal =>
+      traversal
+        .unsafeHas("name", P.within("org-admin", "analyst"))
+        .raw
+        .property("permissions", "manageProcedure")
+        .iterate()
+      Success(())
+    }
+    .removeIndex("Data", IndexType.unique, "data")
 
   val reflectionClasses = new Reflections(
     new ConfigurationBuilder()
diff --git a/thehive/app/org/thp/thehive/services/AlertSrv.scala b/thehive/app/org/thp/thehive/services/AlertSrv.scala
index 9783100087..44924b27a3 100644
--- a/thehive/app/org/thp/thehive/services/AlertSrv.scala
+++ b/thehive/app/org/thp/thehive/services/AlertSrv.scala
@@ -354,12 +354,15 @@ class AlertSrv @Inject() (
       .map(_ => ())
 
   def remove(alert: Alert with Entity)(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
-    for {
-      organisation <- organisationSrv.getOrFail(authContext.organisation)
-      _            <- get(alert).observables.toIterator.toTry(observableSrv.delete(_))
-      _ = get(alert).remove()
-      _ <- auditSrv.alert.delete(alert, organisation)
-    } yield ()
+    auditSrv.mergeAudits {
+      get(alert).observables.toIterator.foreach(observableSrv.delete(_))
+      Success(())
+    } { _ =>
+      for {
+        organisation <- organisationSrv.getOrFail(authContext.organisation)
+        _            <- auditSrv.alert.delete(alert, organisation)
+      } yield get(alert).remove()
+    }
 }
 
 object AlertOps {
diff --git a/thehive/app/org/thp/thehive/services/AuditSrv.scala b/thehive/app/org/thp/thehive/services/AuditSrv.scala
index 39d89adc80..3508249bd7 100644
--- a/thehive/app/org/thp/thehive/services/AuditSrv.scala
+++ b/thehive/app/org/thp/thehive/services/AuditSrv.scala
@@ -286,6 +286,7 @@ class AuditSrv @Inject() (
         graph: Graph,
         authContext: AuthContext
     ): Try[Unit] = {
+      auditSrv.create(Audit(Audit.update, alert, Some(Json.obj("caseId" -> `case`._id).toString)), `case`, Some(`case`))
       val detailsWithAlert = details + ("fromAlert" -> Json.obj(
         "_id"       -> alert._id.toString,
         "type"      -> alert.`type`,
@@ -299,6 +300,7 @@ class AuditSrv @Inject() (
         graph: Graph,
         authContext: AuthContext
     ): Try[Unit] = {
+      auditSrv.create(Audit(Audit.update, alert, Some(Json.obj("caseId" -> `case`._id).toString)), `case`, Some(`case`))
       val detailsWithAlert = details + ("fromAlert" -> Json.obj(
         "_id"       -> alert._id.toString,
         "type"      -> alert.`type`,
diff --git a/thehive/app/org/thp/thehive/services/CustomFieldSrv.scala b/thehive/app/org/thp/thehive/services/CustomFieldSrv.scala
index 5b0c9af5be..9f379b5400 100644
--- a/thehive/app/org/thp/thehive/services/CustomFieldSrv.scala
+++ b/thehive/app/org/thp/thehive/services/CustomFieldSrv.scala
@@ -131,13 +131,6 @@ object CustomFieldOps {
             name -> CustomFieldType.map(tpe).getJsonValue(new CustomFieldValueEdge(edge))
         }
 
-    def jsonValue: Traversal[JsValue, JMap[String, Any], Converter[JsValue, JMap[String, Any]]] =
-      edgeNameType
-        .domainMap {
-          case (edge, _, tpe) =>
-            CustomFieldType.map(tpe).getJsonValue(new CustomFieldValueEdge(edge))
-        }
-
     def nameValue: Traversal[(String, Option[_]), JMap[String, Any], Converter[(String, Option[_]), JMap[String, Any]]] =
       edgeNameType
         .domainMap {
diff --git a/thehive/app/org/thp/thehive/services/DataSrv.scala b/thehive/app/org/thp/thehive/services/DataSrv.scala
index f40ce08c81..957ae3209e 100644
--- a/thehive/app/org/thp/thehive/services/DataSrv.scala
+++ b/thehive/app/org/thp/thehive/services/DataSrv.scala
@@ -3,6 +3,7 @@ package org.thp.thehive.services
 import akka.actor.ActorRef
 import org.apache.tinkerpop.gremlin.process.traversal.P
 import org.apache.tinkerpop.gremlin.structure.T
+import org.thp.scalligraph.EntityId
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.services.{VertexSrv, _}
@@ -13,6 +14,7 @@ import org.thp.thehive.services.DataOps._
 
 import java.lang.{Long => JLong}
 import javax.inject.{Inject, Named, Singleton}
+import scala.collection.mutable
 import scala.util.{Success, Try}
 
 @Singleton
@@ -58,6 +60,23 @@ object DataOps {
 }
 
 class DataIntegrityCheckOps @Inject() (val db: Database, val service: DataSrv) extends IntegrityCheckOps[Data] {
+
+  override def findDuplicates(): Seq[Seq[Data with Entity]] =
+    db.roTransaction { implicit graph =>
+      val map = mutable.Map.empty[String, mutable.Buffer[EntityId]]
+      service
+        .startTraversal
+        .foreach { data =>
+          map.getOrElseUpdate(data.data, mutable.Buffer.empty[EntityId]) += EntityId(data._id)
+        }
+      map
+        .values
+        .collect {
+          case vertexIds if vertexIds.lengthCompare(1) > 0 => service.getByIds(vertexIds: _*).toList
+        }
+        .toSeq
+    }
+
   override def resolve(entities: Seq[Data with Entity])(implicit graph: Graph): Try[Unit] =
     entities match {
       case head :: tail =>
diff --git a/thehive/app/org/thp/thehive/services/IntegrityCheckActor.scala b/thehive/app/org/thp/thehive/services/IntegrityCheckActor.scala
index 1fc88d07c3..4e26cf9682 100644
--- a/thehive/app/org/thp/thehive/services/IntegrityCheckActor.scala
+++ b/thehive/app/org/thp/thehive/services/IntegrityCheckActor.scala
@@ -125,9 +125,9 @@ class IntegrityCheckActor() extends Actor {
         Success(integrityCheck.initialCheck())
       }
     }
-//    integrityCheckOps.foreach { integrityCheck =>
-//      self ! DuplicationCheck(integrityCheck.name)
-//    }
+    integrityCheckOps.foreach { integrityCheck =>
+      self ! DuplicationCheck(integrityCheck.name)
+    }
     globalTimers = integrityCheckOps.map { integrityCheck =>
       val interval     = globalInterval(integrityCheck.name)
       val initialDelay = FiniteDuration((interval.toNanos * Random.nextDouble()).round, NANOSECONDS)
diff --git a/thehive/app/org/thp/thehive/services/ObservableSrv.scala b/thehive/app/org/thp/thehive/services/ObservableSrv.scala
index cbea7a27e1..915eec1471 100644
--- a/thehive/app/org/thp/thehive/services/ObservableSrv.scala
+++ b/thehive/app/org/thp/thehive/services/ObservableSrv.scala
@@ -114,9 +114,11 @@ class ObservableSrv @Inject() (
       .toSeq
       .map(_.toString)
       .toSet
+    val newTags = tags -- currentTags
     for {
-      createdTags <- (tags -- currentTags).filterNot(_.isEmpty).toTry(tagSrv.getOrCreate)
+      createdTags <- newTags.filterNot(_.isEmpty).toTry(tagSrv.getOrCreate)
       _           <- createdTags.toTry(observableTagSrv.create(ObservableTag(), observable, _))
+      _           <- get(observable).update(_.tags, (currentTags ++ newTags).toSeq).getOrFail("Observable")
 //      _           <- auditSrv.observable.update(observable, Json.obj("tags" -> (currentTags ++ tags)))
     } yield createdTags
   }
@@ -137,24 +139,28 @@ class ObservableSrv @Inject() (
   override def delete(observable: Observable with Entity)(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
     get(observable).alert.headOption match {
       case None =>
-        get(observable).share.getOrFail("Share").flatMap {
-          case share if share.owner =>
-            get(observable)
-              .shares
-              .toIterator
-              .toTry { share =>
-                auditSrv
-                  .observable
-                  .delete(observable, share)
-              }
-              .map(_ => get(observable).remove())
-          case share =>
-            for {
-              organisation <- organisationSrv.current.getOrFail("Organisation")
-              _            <- shareSrv.unshareObservable(observable, organisation)
-              _            <- auditSrv.observable.delete(observable, share)
-            } yield ()
-        }
+        get(observable)
+          .share
+          .toIterator
+          .toTry {
+            case share if share.owner =>
+              get(observable)
+                .shares
+                .toIterator
+                .toTry { share =>
+                  auditSrv
+                    .observable
+                    .delete(observable, share)
+                }
+                .map(_ => get(observable).remove())
+            case share =>
+              for {
+                organisation <- organisationSrv.current.getOrFail("Organisation")
+                _            <- shareSrv.unshareObservable(observable, organisation)
+                _            <- auditSrv.observable.delete(observable, share)
+              } yield ()
+          }
+          .map(_ => ())
       case Some(alert) =>
         get(observable).remove()
         auditSrv.observableInAlert.delete(observable, alert)
diff --git a/thehive/app/org/thp/thehive/services/ShareSrv.scala b/thehive/app/org/thp/thehive/services/ShareSrv.scala
index f9cb89a6cd..557c15f873 100644
--- a/thehive/app/org/thp/thehive/services/ShareSrv.scala
+++ b/thehive/app/org/thp/thehive/services/ShareSrv.scala
@@ -86,15 +86,6 @@ class ShareSrv @Inject() (implicit
     } yield newShareProfile
   }
 
-  private def delete(shareId: EntityIdOrName)(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
-    for {
-      share <- getOrFail(shareId)
-      tasks = get(share).tasks.toSeq
-      obs   = get(share).observables.toSeq
-      _ <- tasks.toTry(taskSrv.delete(_))
-      _ <- obs.toTry(observableSrv.delete(_))
-    } yield get(shareId).remove()
-
   def unshareCase(shareId: EntityIdOrName)(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
     for {
       organisation <- get(shareId).organisation.getOrFail("Organisation")
@@ -102,8 +93,7 @@ class ShareSrv @Inject() (implicit
       _ = get(shareId).observables.removeValue(_.organisationIds, organisation._id).barrier().filterNot(_.shares.range(1, 2)).remove()
       _ = get(shareId).tasks.removeValue(_.organisationIds, organisation._id).barrier().filterNot(_.shares.range(1, 2)).remove()
       _ <- auditSrv.share.unshareCase(case0, organisation)
-      _ <- delete(shareId)
-    } yield ()
+    } yield get(shareId).remove()
 
   def unshareTask(
       task: Task with Entity,
diff --git a/thehive/conf/reference.conf b/thehive/conf/reference.conf
index 0bcf7561f6..c2d37f6e68 100644
--- a/thehive/conf/reference.conf
+++ b/thehive/conf/reference.conf
@@ -9,7 +9,7 @@ db {
       directory: /opt/thp/thehive/database
     }
   }
-  initialisationTimeout: 1 hour
+  initialisationTimeout: 14 days
 }
 
 query.limitedCountThreshold: 1000