diff --git a/package.json b/package.json
index afd8e026c..58282f4e2 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,6 @@
     "angular-sanitize": "~1.8.0",
     "angular-ui-bootstrap": "~2.5.6",
     "angular-ui-sortable": "~0.19.0",
-    "array-includes": "~3.1.1",
     "autoprefixer": "~9.8.6",
     "base64-js": "~1.3.1",
     "bootstrap-combobox": "~1.0.2",
@@ -138,15 +137,22 @@
   },
   "packageManager": "yarn@3.5.0",
   "resolutions": {
+    "array-includes": "3.1.6",
+    "array.prototype.flat": "1.3.1",
     "array.prototype.reduce": "1.0.5",
     "es-abstract": "~1.21.2",
     "function.prototype.name": "1.1.5",
-    "moment": "~2.29.4",
     "moment-timezone": "^0.5.41",
+    "moment": "~2.29.4",
     "node-sass": "^8.0.0",
     "nth-check": "^2.1.1",
     "object.entries": "1.1.6",
+    "object.getownpropertydescriptors": "2.1.6",
     "object.values": "1.1.6",
-    "string.prototype.padstart": "3.1.4"
+    "string.prototype.padstart": "3.1.4",
+    "string.prototype.padend": "3.1.4",
+    "string.prototype.trim": "1.2.7",
+    "string.prototype.trimend": "1.0.6",
+    "string.prototype.trimstart": "1.0.6"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 758e6fd85..1acd796b3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2824,7 +2824,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-includes@npm:^3.0.2, array-includes@npm:^3.1.1, array-includes@npm:~3.1.1":
+"array-includes@npm:3.1.6":
   version: 3.1.6
   resolution: "array-includes@npm:3.1.6"
   dependencies:
@@ -2867,7 +2867,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array.prototype.flat@npm:^1.2.3":
+"array.prototype.flat@npm:1.3.1":
   version: 1.3.1
   resolution: "array.prototype.flat@npm:1.3.1"
   dependencies:
@@ -8707,6 +8707,13 @@ fsevents@~2.3.2:
   languageName: node
   linkType: hard
 
+"isarray@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "isarray@npm:2.0.5"
+  checksum: bd5bbe4104438c4196ba58a54650116007fa0262eccef13a4c55b2e09a5b36b59f1e75b9fcc49883dd9d4953892e6fc007eef9e9155648ceea036e184b0f930a
+  languageName: node
+  linkType: hard
+
 "isbinaryfile@npm:^4.0.8":
   version: 4.0.10
   resolution: "isbinaryfile@npm:4.0.10"
@@ -9698,7 +9705,6 @@ fsevents@~2.3.2:
     angular-sanitize: ~1.8.0
     angular-ui-bootstrap: ~2.5.6
     angular-ui-sortable: ~0.19.0
-    array-includes: ~3.1.1
     autoprefixer: ~9.8.6
     axios: ~0.21.0
     babel-eslint: ~10.1.0
@@ -10763,15 +10769,16 @@ fsevents@~2.3.2:
   languageName: node
   linkType: hard
 
-"object.getownpropertydescriptors@npm:^2.0.2, object.getownpropertydescriptors@npm:^2.0.3":
-  version: 2.1.5
-  resolution: "object.getownpropertydescriptors@npm:2.1.5"
+"object.getownpropertydescriptors@npm:2.1.6":
+  version: 2.1.6
+  resolution: "object.getownpropertydescriptors@npm:2.1.6"
   dependencies:
     array.prototype.reduce: ^1.0.5
     call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
-  checksum: 7883e1aac1f9cd4cd85e2bb8c7aab6a60940a7cfe07b788356f301844d4967482fc81058e7bda24e1b3909cbb4879387ea9407329b78704f8937bc0b97dec58b
+    define-properties: ^1.2.0
+    es-abstract: ^1.21.2
+    safe-array-concat: ^1.0.0
+  checksum: 7757ce0ef61c8bee7f8043f8980fd3d46fc1ab3faf0795bd1f9f836781143b4afc91f7219a3eed4675fbd0b562f3708f7e736d679ebfd43ea37ab6077d9f5004
   languageName: node
   linkType: hard
 
@@ -12418,6 +12425,18 @@ fsevents@~2.3.2:
   languageName: node
   linkType: hard
 
+"safe-array-concat@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "safe-array-concat@npm:1.0.1"
+  dependencies:
+    call-bind: ^1.0.2
+    get-intrinsic: ^1.2.1
+    has-symbols: ^1.0.3
+    isarray: ^2.0.5
+  checksum: 001ecf1d8af398251cbfabaf30ed66e3855127fbceee178179524b24160b49d15442f94ed6c0db0b2e796da76bb05b73bf3cc241490ec9c2b741b41d33058581
+  languageName: node
+  linkType: hard
+
 "safe-buffer@npm:5.1.2, safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1":
   version: 5.1.2
   resolution: "safe-buffer@npm:5.1.2"
@@ -13377,7 +13396,7 @@ fsevents@~2.3.2:
   languageName: node
   linkType: hard
 
-"string.prototype.padend@npm:^3.0.0":
+"string.prototype.padend@npm:3.1.4":
   version: 3.1.4
   resolution: "string.prototype.padend@npm:3.1.4"
   dependencies:
@@ -13399,7 +13418,7 @@ fsevents@~2.3.2:
   languageName: node
   linkType: hard
 
-"string.prototype.trim@npm:^1.2.7":
+"string.prototype.trim@npm:1.2.7":
   version: 1.2.7
   resolution: "string.prototype.trim@npm:1.2.7"
   dependencies:
@@ -13410,7 +13429,7 @@ fsevents@~2.3.2:
   languageName: node
   linkType: hard
 
-"string.prototype.trimend@npm:^1.0.3, string.prototype.trimend@npm:^1.0.6":
+"string.prototype.trimend@npm:1.0.6":
   version: 1.0.6
   resolution: "string.prototype.trimend@npm:1.0.6"
   dependencies:
@@ -13443,7 +13462,7 @@ fsevents@~2.3.2:
   languageName: node
   linkType: hard
 
-"string.prototype.trimstart@npm:^1.0.3, string.prototype.trimstart@npm:^1.0.6":
+"string.prototype.trimstart@npm:1.0.6":
   version: 1.0.6
   resolution: "string.prototype.trimstart@npm:1.0.6"
   dependencies: