diff --git a/app/config/collections.php b/app/config/collections.php
index e41340f7a4..be485316ab 100644
--- a/app/config/collections.php
+++ b/app/config/collections.php
@@ -1437,22 +1437,61 @@ $commonCollections = [
                 'default' => null,
                 'array' => false,
                 'filters' => ['json', 'encrypt'],
-            ]
+            ],
+            [
+                '$id' => ID::custom('search'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 65535,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
         ],
         'indexes' => [
             [
                 '$id' => ID::custom('_key_provider'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['provider'],
-                'lengths' => [128],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
                 '$id' => ID::custom('_key_name'),
                 'type' => Database::INDEX_FULLTEXT,
                 'attributes' => ['name'],
-                'lengths' => [128],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_type'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['type'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_default'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['default'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_default_type'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['default, type'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_search'),
+                'type' => Database::INDEX_FULLTEXT,
+                'attributes' => ['search'],
+                'lengths' => [],
+                'orders' => [],
             ]
         ],
     ],
@@ -1488,7 +1527,7 @@ $commonCollections = [
                 '$id' => ID::custom('data'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => 16384,
+                'size' => 65535,
                 'signed' => true,
                 'required' => true,
                 'default' => null,
@@ -1499,7 +1538,7 @@ $commonCollections = [
                 '$id' => ID::custom('to'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => 16834,
+                'size' => 65535,
                 'signed' => true,
                 'required' => true,
                 'default' => null,
@@ -1518,10 +1557,10 @@ $commonCollections = [
                 'filters' => ['datetime'],
             ],
             [
-                '$id' => ID::custom('deliveryError'),
+                '$id' => ID::custom('deliveryErrors'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => 16834,
+                'size' => 65535,
                 'signed' => true,
                 'required' => false,
                 'default' => null,
@@ -1567,14 +1606,14 @@ $commonCollections = [
                 '$id' => ID::custom('_key_providerId'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['providerId'],
-                'lengths' => [128],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
                 '$id' => ID::custom('_key_providerInternalId'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['providerInternalId'],
-                'lengths' => [128],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
@@ -1646,21 +1685,32 @@ $commonCollections = [
                 'default' => null,
                 'array' => false,
                 'filters' => ['subQueryTopicTargets'],
-            ]
+            ],
+            [
+                '$id' => ID::custom('search'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 16384,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
         ],
         'indexes' => [
             [
                 '$id' => ID::custom('_key_providerId'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['providerId'],
-                'lengths' => [128],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
                 '$id' => ID::custom('_key_providerInternalId'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['providerInternalId'],
-                'lengths' => [128],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
@@ -1671,12 +1721,12 @@ $commonCollections = [
                 'orders' => [],
             ],
             [
-                '$id' => ID::custom('_key_description'),
+                '$id' => ID::custom('_key_search'),
                 'type' => Database::INDEX_FULLTEXT,
-                'attributes' => ['description'],
+                'attributes' => ['name'],
                 'lengths' => [],
-                'orders' => [],
-            ],
+                'orders' => [Database::ORDER_ASC],
+            ]
         ],
     ],
 
@@ -1826,7 +1876,7 @@ $commonCollections = [
                 '$id' => ID::custom('identifier'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => Database::LENGTH_KEY,
+                'size' => 2048,
                 'signed' => true,
                 'required' => true,
                 'default' => null,
@@ -1839,14 +1889,14 @@ $commonCollections = [
                 '$id' => ID::custom('_key_userId'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['userId'],
-                'lengths' => [128],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
                 '$id' => ID::custom('_key_userInternalId'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['userInternalId'],
-                'lengths' => [128],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [