From dc4ed2a99c117ba23d33d0527f4b5bd1a43d963c Mon Sep 17 00:00:00 2001
From: mdecimus <mauro@stalw.art>
Date: Thu, 1 Aug 2024 16:20:11 +0200
Subject: [PATCH] v0.1.9

---
 CHANGELOG.md                              |  10 +
 Cargo.lock                                | 325 ++++++-----
 Cargo.toml                                |   6 +-
 src/components/form/select.rs             | 110 ++--
 src/components/form/stacked_badge.rs      |  91 ++-
 src/components/messages/alert.rs          |   5 -
 src/core/form.rs                          |  24 +-
 src/core/http.rs                          |   2 +-
 src/core/schema.rs                        |  33 +-
 src/pages/account/crypto.rs               |   6 +-
 src/pages/config/edit.rs                  |  25 +-
 src/pages/config/mod.rs                   |  10 +-
 src/pages/config/schema/auth.rs           |   6 +-
 src/pages/config/schema/authentication.rs |   2 +-
 src/pages/config/schema/directory.rs      |   4 +-
 src/pages/config/schema/listener.rs       |   2 +-
 src/pages/config/schema/server.rs         |  28 +-
 src/pages/config/schema/smtp.rs           |  18 +-
 src/pages/config/schema/spamlists.rs      |   4 +-
 src/pages/config/schema/storage.rs        |   8 +-
 src/pages/config/schema/store.rs          |   6 +-
 src/pages/config/schema/tls.rs            |  12 +-
 src/pages/config/schema/tracing.rs        | 680 +++++++++++++++++++++-
 src/pages/directory/principals/edit.rs    |   4 +-
 src/pages/manage/spam.rs                  |  20 +-
 25 files changed, 1118 insertions(+), 323 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d72be7..db8db82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.1.9] - 2024-08-01
+
+## Added
+- More tracing configuration options.
+- Custom event levels.
+
+### Changed
+
+### Fixed
+
 ## [0.1.8] - 2024-07-07
 
 ## Added
diff --git a/Cargo.lock b/Cargo.lock
index 6ea80dc..b415142 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19,7 +19,7 @@ dependencies = [
  "once_cell",
  "serde",
  "version_check",
- "zerocopy",
+ "zerocopy 0.7.35",
 ]
 
 [[package]]
@@ -65,9 +65,9 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.80"
+version = "0.1.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -76,9 +76,9 @@ dependencies = [
 
 [[package]]
 name = "attribute-derive"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b48808b337d6b74c15ff9becfc0e139fe2b4e2b224d670a0ecdb46b0b2d3d9b"
+checksum = "1f1ee502851995027b06f99f5ffbeffa1406b38d0b318a1ebfa469332c6cbafd"
 dependencies = [
  "attribute-derive-macro",
  "derive-where",
@@ -90,9 +90,9 @@ dependencies = [
 
 [[package]]
 name = "attribute-derive-macro"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b19cbd63850ecff821c413e12846a67ec9f4ce7309c70959b94ecf9b2575ee2"
+checksum = "3601467f634cfe36c4780ca9c75dea9a5b34529c1f2810676a337e7e0997f954"
 dependencies = [
  "collection_literals",
  "interpolator",
@@ -130,9 +130,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "block-buffer"
@@ -171,9 +171,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytemuck"
-version = "1.16.1"
+version = "1.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
+checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83"
 
 [[package]]
 name = "byteorder"
@@ -181,11 +181,17 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
+[[package]]
+name = "byteorder-lite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
+
 [[package]]
 name = "bytes"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "fca2be1d5c43812bae364ee3f30b3afcb7877cf59f4aeb94c66f313a41d2fac9"
 
 [[package]]
 name = "camino"
@@ -195,9 +201,9 @@ checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239"
 
 [[package]]
 name = "cc"
-version = "1.0.99"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
+checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"
 
 [[package]]
 name = "cfg-if"
@@ -266,16 +272,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "collection_literals"
-version = "1.0.1"
+name = "codee"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "186dce98367766de751c42c4f03970fc60fc012296e706ccbb9d5df9b6c1e271"
+checksum = "af40247be877a1e3353fb406aa27ab3ef4bd3ff18cef91e75e667bfa3fde701d"
+dependencies = [
+ "thiserror",
+]
 
 [[package]]
-name = "color_quant"
-version = "1.1.0"
+name = "collection_literals"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
+checksum = "186dce98367766de751c42c4f03970fc60fc012296e706ccbb9d5df9b6c1e271"
 
 [[package]]
 name = "config"
@@ -409,9 +418,9 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.20.9"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -419,9 +428,9 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.9"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
 dependencies = [
  "fnv",
  "ident_case",
@@ -433,9 +442,9 @@ dependencies = [
 
 [[package]]
 name = "darling_macro"
-version = "0.20.9"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
@@ -515,9 +524,9 @@ checksum = "669a445ee724c5c69b1b06fe0b63e70a1c84bc9bb7d9696cd4f4e3ec45050408"
 
 [[package]]
 name = "either"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "equivalent"
@@ -692,6 +701,27 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "gloo-net"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06f627b1a58ca3d42b45d6104bf1e1a03799df472df00988b6ba21accc10580"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-sink",
+ "gloo-utils",
+ "http 1.1.0",
+ "js-sys",
+ "pin-project",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "gloo-storage"
 version = "0.3.0"
@@ -848,22 +878,21 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.24.9"
+version = "0.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
+checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
 dependencies = [
  "bytemuck",
- "byteorder",
- "color_quant",
+ "byteorder-lite",
  "num-traits",
  "png",
 ]
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -907,15 +936,15 @@ dependencies = [
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "leptos"
-version = "0.6.12"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5fae88b21265cbb847c891d7cf660e284a1282da15459691992be9358e906fb"
+checksum = "57727cd8f6d1e78aa9721270002037d7f63b5a7a2b60a7830239f6938cbca9b7"
 dependencies = [
  "cfg-if",
  "leptos_config",
@@ -933,12 +962,13 @@ dependencies = [
 
 [[package]]
 name = "leptos-use"
-version = "0.10.10"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3272d90b77cdbb99e9060f90eb6f5738e56128b2f912db57a50efb006a26e262"
+checksum = "ac79c02d0e2998569116aa36d26fd00bfa8cadbe8cb630eb771b4d1676412a16"
 dependencies = [
  "async-trait",
  "cfg-if",
+ "codee",
  "cookie",
  "default-struct-builder",
  "futures-util",
@@ -956,9 +986,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_config"
-version = "0.6.12"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec33b6f994829469ba7c62bfd5fb572a639071d0de715a41c2aa0df86301a4fa"
+checksum = "6e519478cf13b84e0169f14660fda6425a419d181903cf511cec416555c9ff51"
 dependencies = [
  "config",
  "regex",
@@ -969,9 +999,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_dom"
-version = "0.6.12"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "867d2afc153cc0f1d6f775872d5dfc409385f4d8544831ee45f720d88f363e6b"
+checksum = "46a32ccb530d95c82b522ff86827a9c14efb3d3a75c508c20605d4603beb1695"
 dependencies = [
  "async-recursion",
  "cfg-if",
@@ -999,9 +1029,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_hot_reload"
-version = "0.6.12"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec5ce56051f2eff2c4736b7a2056177e67be19597b767ff72fbab20917a7422d"
+checksum = "71eb2b309ff0e526d147e32afcbbbf39b43c1ed5b7264b7abfb6635c388c0e9e"
 dependencies = [
  "anyhow",
  "camino",
@@ -1017,9 +1047,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_macro"
-version = "0.6.12"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "019016cc0193831660a7794aa046e4c01617d97ccb2f403a5c10b21744391a71"
+checksum = "d38b41f4e38b6f0e26858ae40464e12702096d2219c48afd41b79693fd025a9d"
 dependencies = [
  "attribute-derive",
  "cfg-if",
@@ -1040,9 +1070,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_meta"
-version = "0.6.12"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "873ec368535d9971df4848ca21e91aa96fa00a6884258ab8f926db69ea97f547"
+checksum = "206825db2cb802a9b06c1f33c08569086706a7fa4d8acb86e5ed6892a8dd2cec"
 dependencies = [
  "cfg-if",
  "indexmap",
@@ -1054,9 +1084,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_reactive"
-version = "0.6.12"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076064e3c84e3aa12d4bad283e82ba5968675f5f9714d04a5c38f169cd4f26b5"
+checksum = "bc38db7b14f2d48cb427dd4c197ee58354f5de9407fb3417f2ee7ff85097ffd3"
 dependencies = [
  "base64",
  "cfg-if",
@@ -1081,12 +1111,12 @@ dependencies = [
 
 [[package]]
 name = "leptos_router"
-version = "0.6.12"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66db10225f0caf60b0183935b288791ac3494ca6e1306d415ea97287b6c2db5"
+checksum = "d397f1c3217368aaf6009ea0bf6bdfa47325ab9c8fb8c124eda5ebc527d11445"
 dependencies = [
  "cfg-if",
- "gloo-net",
+ "gloo-net 0.5.0",
  "itertools",
  "js-sys",
  "lazy_static",
@@ -1107,9 +1137,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_server"
-version = "0.6.12"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "603064a2d7ac46dba4b3ed5397a475076f9738918dd605670869dfe877d5966c"
+checksum = "9c0ea6eed569e70fa4eed722ee3f042ed76c40d2b0a82b7240eb660893d6a5e9"
 dependencies = [
  "inventory",
  "lazy_static",
@@ -1155,9 +1185,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "manyhow"
@@ -1362,9 +1392,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "dee4364d9f3b902ef14fab8a1ddffb783a1cb6b4bba3bfc1fa3922732c7de97f"
+dependencies = [
+ "zerocopy 0.6.6",
+]
 
 [[package]]
 name = "prettyplease"
@@ -1455,9 +1488,9 @@ checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142"
 
 [[package]]
 name = "qrcodegen-image"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f59a7c7ddb94c99fa3942dd761dbb305bca462b71d7bd9bcb3f9ff4d454d5736"
+checksum = "221b7eace1aef8c95d65dbe09fb7a1a43d006045394a89afba6997721fcb7708"
 dependencies = [
  "base64",
  "image",
@@ -1475,9 +1508,9 @@ dependencies = [
 
 [[package]]
 name = "quote-use"
-version = "0.8.0"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b393938dcaab992375d7b3df7887fa98cc91c2f3590598251e7c609e2b788139"
+checksum = "48e96ac59974192a2fa6ee55a41211cf1385c5b2a8636a4c3068b3b3dd599ece"
 dependencies = [
  "quote",
  "quote-use-macros",
@@ -1485,9 +1518,9 @@ dependencies = [
 
 [[package]]
 name = "quote-use-macros"
-version = "0.8.0"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d8772387900c205780e2c240cfe4dd01355ab4f96a503d99bdf34ad73180ef"
+checksum = "b4c57308e9dde4d7be9af804f6deeaa9951e1de1d5ffce6142eb964750109f7e"
 dependencies = [
  "derive-where",
  "proc-macro-utils",
@@ -1528,11 +1561,11 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
+checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -1622,9 +1655,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.203"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
 dependencies = [
  "serde_derive",
 ]
@@ -1642,9 +1675,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.203"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1653,11 +1686,12 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.117"
+version = "1.0.121"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609"
 dependencies = [
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
@@ -1686,9 +1720,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.6"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
+checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
 dependencies = [
  "serde",
 ]
@@ -1716,16 +1750,16 @@ dependencies = [
 
 [[package]]
 name = "server_fn"
-version = "0.6.12"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b06e6e5467a2cd93ce1accfdfd8b859404f0b3b2041131ffd774fabf666b8219"
+checksum = "e9aaae169927ef701a4734d680adcb08f13269c9f0af822bf175d681fe56d65c"
 dependencies = [
  "bytes",
  "ciborium",
  "const_format",
  "dashmap",
  "futures",
- "gloo-net",
+ "gloo-net 0.5.0",
  "http 1.1.0",
  "js-sys",
  "once_cell",
@@ -1745,9 +1779,9 @@ dependencies = [
 
 [[package]]
 name = "server_fn_macro"
-version = "0.6.12"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09c216bb1c1ac890151397643c663c875a1836adf0b269be4e389cb1b48c173c"
+checksum = "583085903fd5d091884eb52d99550e32777015af21f0f5dbec49bedcc320ce82"
 dependencies = [
  "const_format",
  "convert_case",
@@ -1759,9 +1793,9 @@ dependencies = [
 
 [[package]]
 name = "server_fn_macro_default"
-version = "0.6.12"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00783df297ec85ea605779f2fef9cbec98981dffe2e01e1a9845c102ee1f1ae6"
+checksum = "b628649700e28cf8bc33e0df5de5c9d591a1828ba005a25b425477055f1e0e74"
 dependencies = [
  "server_fn_macro",
  "syn",
@@ -1860,9 +1894,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "2.0.67"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1883,18 +1917,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.61"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.61"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1934,9 +1968,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.6.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -1949,9 +1983,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "toml"
-version = "0.8.14"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -1961,18 +1995,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.6"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.14"
+version = "0.22.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
+checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
 dependencies = [
  "indexmap",
  "serde",
@@ -1983,9 +2017,9 @@ dependencies = [
 
 [[package]]
 name = "totp-rs"
-version = "5.5.1"
+version = "5.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c4ae9724c5888c0417d2396037ed3b60665925624766416e3e342b6ba5dbd3f"
+checksum = "17b2f27dad992486c26b4e7455f38aa487e838d6d61b57e72906ee2b8c287a90"
 dependencies = [
  "base32",
  "constant_time_eq",
@@ -2113,18 +2147,18 @@ checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3"
 
 [[package]]
 name = "uuid"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 dependencies = [
  "getrandom",
 ]
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "walkdir"
@@ -2243,7 +2277,7 @@ dependencies = [
 
 [[package]]
 name = "webadmin"
-version = "0.1.8"
+version = "0.1.9"
 dependencies = [
  "ahash",
  "base64",
@@ -2252,7 +2286,7 @@ dependencies = [
  "console_error_panic_hook",
  "console_log",
  "form_urlencoded",
- "gloo-net",
+ "gloo-net 0.6.0",
  "gloo-storage",
  "humansize",
  "leptos",
@@ -2300,9 +2334,9 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
  "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
@@ -2316,66 +2350,66 @@ dependencies = [
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.13"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "xxhash-rust"
-version = "0.8.10"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03"
+checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984"
 
 [[package]]
 name = "yansi"
@@ -2385,18 +2419,39 @@ checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.34"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive 0.6.6",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
- "zerocopy-derive",
+ "zerocopy-derive 0.7.35",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.34"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index ec7f739..ff2a2de 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ homepage = "https://stalw.art"
 keywords = ["web", "admin", "email", "mail", "server"]
 categories = ["email"]
 license = "AGPL-3.0-only OR LicenseRef-SEL"
-version = "0.1.8"
+version = "0.1.9"
 edition = "2021"
 resolver = "2"
 
@@ -16,8 +16,8 @@ console_error_panic_hook = "0.1.7"
 leptos = { version = "0.6.9", features = ["csr"] }
 leptos_meta = { version = "0.6.9", features = ["csr"] }
 leptos_router = { version = "0.6.9", features = ["csr"] }
-leptos-use = "0.10.2"
-gloo-net = { version = "0.5", features = ["http"] }
+leptos-use = "0.11"
+gloo-net = { version = "0.6", features = ["http"] }
 gloo-storage = "0.3.0"
 serde = { version = "1", features = ["derive", "rc"] }
 serde_json = "1.0.113"
diff --git a/src/components/form/select.rs b/src/components/form/select.rs
index 4b8e183..5990c4a 100644
--- a/src/components/form/select.rs
+++ b/src/components/form/select.rs
@@ -360,53 +360,69 @@ pub fn SelectCron(
 }
 
 impl FormData {
-    fn select_sources(&self, id: &str) -> Vec<(String, String)> {
-        match &self.schema.fields.get(id).unwrap().typ_ {
-            Type::Select {
-                source: Source::Static(options),
-                ..
-            } => options
-                .iter()
-                .map(|(value, label)| (value.to_string(), label.to_string()))
-                .collect::<Vec<_>>(),
-            Type::Select {
-                source:
-                    Source::Dynamic {
-                        schema,
-                        field,
-                        filter,
-                    },
-                ..
-            } => {
-                let filter = filter.eval(self);
-
-                self.external_sources
-                    .get(&format!("{}_{}", schema.id, field.id))
-                    .map(|source| {
-                        source
-                            .iter()
-                            .filter_map(|(id, value)| {
-                                if filter.map_or(true, |values| values.contains(&value.as_str())) {
-                                    (
-                                        id.to_string(),
-                                        if !value.is_empty() {
-                                            format!("{} ({})", field.typ_.label(value), id)
-                                        } else {
-                                            id.to_string()
-                                        },
-                                    )
-                                        .into()
-                                } else {
-                                    None
-                                }
-                            })
-                            .chain([(String::new(), "-- None --".to_string())])
-                            .collect::<Vec<_>>()
-                    })
-                    .unwrap_or_default()
-            }
-            _ => panic!("Invalid schema type for select"),
-        }
+    pub fn select_sources(&self, id: &str) -> Vec<(String, String)> {
+        self.schema
+            .fields
+            .get(id)
+            .map(|t| match &t.typ_ {
+                Type::Select {
+                    source: Source::Static(options),
+                    ..
+                } => options
+                    .iter()
+                    .map(|(value, label)| (value.to_string(), label.to_string()))
+                    .collect::<Vec<_>>(),
+                Type::Select {
+                    source: Source::StaticId(options),
+                    ..
+                } => options
+                    .iter()
+                    .map(|id| (id.to_string(), id.to_string()))
+                    .collect::<Vec<_>>(),
+                Type::Select {
+                    source:
+                        Source::Dynamic {
+                            schema,
+                            field,
+                            filter,
+                        },
+                    ..
+                } => {
+                    let filter = filter.eval(self);
+
+                    self.external_sources
+                        .get(&format!("{}_{}", schema.id, field.id))
+                        .map(|source| {
+                            source
+                                .iter()
+                                .filter_map(|(id, value)| {
+                                    if filter
+                                        .map_or(true, |values| values.contains(&value.as_str()))
+                                    {
+                                        (
+                                            id.to_string(),
+                                            if !value.is_empty() {
+                                                format!("{} ({})", field.typ_.label(value), id)
+                                            } else {
+                                                id.to_string()
+                                            },
+                                        )
+                                            .into()
+                                    } else {
+                                        None
+                                    }
+                                })
+                                .chain([(String::new(), "-- None --".to_string())])
+                                .collect::<Vec<_>>()
+                        })
+                        .unwrap_or_default()
+                }
+                _ => {
+                    log::warn!("Invalid schema type for select");
+                    Vec::new()
+                }
+            })
+            .unwrap_or_default()
     }
 }
 
diff --git a/src/components/form/stacked_badge.rs b/src/components/form/stacked_badge.rs
index e9ca2f4..375d211 100644
--- a/src/components/form/stacked_badge.rs
+++ b/src/components/form/stacked_badge.rs
@@ -19,9 +19,10 @@ pub fn StackedBadge(
     #[prop(into, optional)] validate_item: Option<Callback<(String, ValidateCb), ()>>,
 ) -> impl IntoView {
     let show_tooltip = create_rw_signal(false);
-    let add_value = create_rw_signal(String::new());
     let validation_error = create_rw_signal(None::<String>);
-
+    let select_options =
+        create_memo(move |_| element.data.get_untracked().select_sources(element.id));
+    let add_value = create_rw_signal(String::new());
     let value = create_memo(move |_| {
         element
             .data
@@ -35,11 +36,12 @@ pub fn StackedBadge(
 
     let validate_value = move || {
         let add_value = add_value.get().trim().to_string();
-        if !element
-            .data
-            .get()
-            .array_value(element.id)
-            .any(|v| v == add_value)
+        if !add_value.is_empty()
+            && !element
+                .data
+                .get()
+                .array_value(element.id)
+                .any(|v| v == add_value)
         {
             if let Some(cb) = validate_item.as_ref() {
                 cb.call((
@@ -138,29 +140,67 @@ pub fn StackedBadge(
         >
             <div>
                 <div class="flex rounded-lg shadow-sm">
-                    <input
-                        type="text"
-                        class=move || {
-                            if validation_error.get().is_none() {
-                                "py-2 px-3 block w-full border-gray-200 shadow-sm rounded-s-md text-sm focus:z-10 focus:border-blue-500 focus:ring-blue-500 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400"
-                            } else {
-                                "py-2 px-3 block w-full border-red-500 shadow-sm rounded-s-md text-sm focus:z-10 focus:border-red-500 focus:ring-red-500 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400"
+
+                    {move || {
+                        if select_options.get().is_empty() {
+                            view! {
+                                <input
+                                    type="text"
+                                    class=move || {
+                                        if validation_error.get().is_none() {
+                                            "py-2 px-3 block w-full border-gray-200 shadow-sm rounded-s-md text-sm focus:z-10 focus:border-blue-500 focus:ring-blue-500 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400"
+                                        } else {
+                                            "py-2 px-3 block w-full border-red-500 shadow-sm rounded-s-md text-sm focus:z-10 focus:border-red-500 focus:ring-red-500 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400"
+                                        }
+                                    }
+
+                                    prop:value=add_value
+                                    on:change=move |ev| {
+                                        add_value.set(event_target_value(&ev));
+                                    }
+
+                                    on:keyup=move |ev| {
+                                        if ev.unchecked_ref::<web_sys::KeyboardEvent>().key_code()
+                                            == 13
+                                        {
+                                            add_value.set(event_target_value(&ev));
+                                            validate_value();
+                                        }
+                                    }
+                                />
                             }
-                        }
+                                .into_view()
+                        } else {
+                            view! {
+                                <select
+                                    class=move || {
+                                        if validation_error.get().is_none() {
+                                            "py-2 px-3 pe-9 block w-full border-gray-200 rounded-lg text-sm focus:border-blue-500 focus:ring-blue-500 disabled:opacity-50 disabled:pointer-events-none dark:bg-slate-900 dark:border-gray-700 dark:text-gray-400 dark:focus:ring-gray-600"
+                                        } else {
+                                            "py-2 px-3 pe-9 block w-full border-red-500 rounded-lg text-sm focus:border-red-500 focus:ring-red-500 disabled:opacity-50 disabled:pointer-events-none dark:bg-slate-900 dark:border-gray-700 dark:text-gray-400 dark:focus:ring-gray-600"
+                                        }
+                                    }
 
-                        prop:value=add_value
-                        on:change=move |ev| {
-                            add_value.set(event_target_value(&ev));
-                        }
+                                    on:change=move |ev| {
+                                        add_value.set(event_target_value(&ev));
+                                    }
+                                >
 
-                        on:keyup=move |ev| {
-                            if ev.unchecked_ref::<web_sys::KeyboardEvent>().key_code() == 13 {
-                                add_value.set(event_target_value(&ev));
-                                validate_value();
+                                    <option value="">-- Select an option --</option>
+                                    <For
+                                        each=move || select_options.get()
+                                        key=move |(id, _)| id.clone()
+                                        children=move |(id, label)| {
+                                            let id_ = id.clone();
+                                            view! { <option value=id_>{label}</option> }
+                                        }
+                                    />
+
+                                </select>
                             }
+                                .into_view()
                         }
-                    />
-
+                    }}
                     <button
                         type="button"
                         class="-ms-px py-2 px-3 inline-flex justify-center items-center gap-x-2 text-sm font-semibold border border-transparent bg-blue-600 text-white hover:bg-blue-700 disabled:opacity-50 disabled:pointer-events-none dark:focus:outline-none dark:focus:ring-1 dark:focus:ring-gray-600"
@@ -171,7 +211,6 @@ pub fn StackedBadge(
 
                         Add
                     </button>
-
                     <button
                         type="button"
                         class="-ms-px py-2 px-3 inline-flex justify-center items-center gap-2 border font-medium bg-white text-gray-700 rounded-e-md shadow-sm align-middle hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-blue-600 transition-all text-sm dark:bg-gray-800 dark:hover:bg-slate-800 dark:border-gray-700 dark:text-gray-400 dark:hover:text-white"
diff --git a/src/components/messages/alert.rs b/src/components/messages/alert.rs
index 291d7fd..4576898 100644
--- a/src/components/messages/alert.rs
+++ b/src/components/messages/alert.rs
@@ -274,11 +274,6 @@ impl From<http::Error> for Alert {
                     ManagementApiError::Other { details } => {
                         ("Operation failed".to_string(), details)
                     }
-                    ManagementApiError::UnsupportedDirectoryOperation { class } => (
-                        format!("{class} directory cannot be managed"),
-                        "Only internal directories support inserts and update operations."
-                            .to_string(),
-                    ),
                 };
 
                 Alert::error(title).with_details(details)
diff --git a/src/core/form.rs b/src/core/form.rs
index 6fda227..c5b6902 100644
--- a/src/core/form.rs
+++ b/src/core/form.rs
@@ -19,7 +19,7 @@ use crate::pages::config::{Settings, SettingsValues};
 use super::expr::parser::ExpressionParser;
 use super::expr::tokenizer::Tokenizer;
 use super::expr::{Constant, ParseValue, Token};
-use super::schema::{NumberType, SchemaType, Type};
+use super::schema::{NumberType, SchemaType, SelectType, Type};
 
 use super::schema::{InputCheck, Schema, Transformer, Validator};
 
@@ -464,7 +464,10 @@ impl FormData {
                     | Type::Duration
                     | Type::Rate
                     | Type::Cron
-                    | Type::Select { multi: false, .. } => {
+                    | Type::Select {
+                        typ: SelectType::Single,
+                        ..
+                    } => {
                         match check.check_value(self.value::<String>(field.id).unwrap_or_default())
                         {
                             Ok(value) => {
@@ -479,7 +482,11 @@ impl FormData {
                             }
                         }
                     }
-                    Type::Array | Type::Select { multi: true, .. } => {
+                    Type::Array
+                    | Type::Select {
+                        typ: SelectType::Many | SelectType::ManyWithSearch,
+                        ..
+                    } => {
                         let mut total_values = 0;
                         for (idx, result) in self
                             .array_value(field.id)
@@ -641,7 +648,10 @@ impl FormData {
                     Type::Input
                     | Type::Secret
                     | Type::Text
-                    | Type::Select { multi: false, .. }
+                    | Type::Select {
+                        typ: SelectType::Single,
+                        ..
+                    }
                     | Type::Boolean
                     | Type::Duration
                     | Type::Rate
@@ -651,7 +661,11 @@ impl FormData {
                             data.set(field.id, value);
                         }
                     }
-                    Type::Array | Type::Select { multi: true, .. } => {
+                    Type::Array
+                    | Type::Select {
+                        typ: SelectType::Many | SelectType::ManyWithSearch,
+                        ..
+                    } => {
                         let values = settings.array_values(field.id);
                         if !values.is_empty() {
                             data.array_set(field.id, values.into_iter().map(|(_, value)| value));
diff --git a/src/core/http.rs b/src/core/http.rs
index 308f256..dc85b59 100644
--- a/src/core/http.rs
+++ b/src/core/http.rs
@@ -27,6 +27,7 @@ pub enum Response<T> {
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(tag = "error")]
+#[serde(rename_all = "camelCase")]
 pub enum ManagementApiError {
     FieldAlreadyExists { field: String, value: String },
     FieldMissing { field: String },
@@ -34,7 +35,6 @@ pub enum ManagementApiError {
     Unsupported { details: String },
     AssertFailed,
     Other { details: String },
-    UnsupportedDirectoryOperation { class: String },
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
diff --git a/src/core/schema.rs b/src/core/schema.rs
index a07d4f1..2d724ba 100644
--- a/src/core/schema.rs
+++ b/src/core/schema.rs
@@ -29,7 +29,7 @@ pub enum Type<S, F> {
     #[default]
     Expression,
     Select {
-        multi: bool,
+        typ: SelectType,
         source: Source<S, F>,
     },
     Boolean,
@@ -39,6 +39,14 @@ pub enum Type<S, F> {
     Cron,
 }
 
+#[derive(Clone, Copy, Default, Debug)]
+pub enum SelectType {
+    #[default]
+    Single,
+    Many,
+    ManyWithSearch,
+}
+
 #[derive(Clone, Default, Debug)]
 pub struct Field {
     pub id: &'static str,
@@ -131,6 +139,7 @@ pub struct Section {
 #[derive(Clone, Debug)]
 pub enum Source<S, F> {
     Static(&'static [(&'static str, &'static str)]),
+    StaticId(&'static [&'static str]),
     Dynamic {
         schema: S,
         field: F,
@@ -319,7 +328,12 @@ impl Field {
     pub fn is_multivalue(&self) -> bool {
         matches!(
             self.typ_,
-            Type::Array | Type::Expression | Type::Select { multi: true, .. }
+            Type::Array
+                | Type::Expression
+                | Type::Select {
+                    typ: SelectType::Many | SelectType::ManyWithSearch,
+                    ..
+                }
         )
     }
 }
@@ -612,7 +626,7 @@ impl Builder<(Schemas, Schema), Field> {
                         field,
                         filter,
                     },
-                multi,
+                typ,
             } => {
                 let schema = self.schema(schema);
 
@@ -628,7 +642,7 @@ impl Builder<(Schemas, Schema), Field> {
                         schema,
                         filter,
                     },
-                    multi,
+                    typ,
                 }
             }
             typ_ => typ_.into(),
@@ -944,10 +958,17 @@ impl From<Type<&'static str, &'static str>> for Type<Arc<Schema>, Arc<Field>> {
             Type::Rate => Type::Rate,
             Type::Select {
                 source: Source::Static(items),
-                multi,
+                typ,
             } => Type::Select {
                 source: Source::Static(items),
-                multi,
+                typ,
+            },
+            Type::Select {
+                source: Source::StaticId(items),
+                typ,
+            } => Type::Select {
+                source: Source::StaticId(items),
+                typ,
             },
             Type::Select { .. } => unreachable!(),
         }
diff --git a/src/pages/account/crypto.rs b/src/pages/account/crypto.rs
index 7a2d24d..88a6743 100644
--- a/src/pages/account/crypto.rs
+++ b/src/pages/account/crypto.rs
@@ -26,7 +26,7 @@ use crate::{
         form::FormData,
         http::{self, Error, HttpRequest},
         oauth::use_authorization,
-        schema::{Builder, Schemas, Source, Transformer, Type, Validator},
+        schema::{Builder, Schemas, SelectType, Source, Transformer, Type, Validator},
     },
 };
 
@@ -292,14 +292,14 @@ impl Builder<Schemas, ()> {
             .new_field("type")
             .typ(Type::Select {
                 source: Source::Static(METHODS),
-                multi: false,
+                typ: SelectType::Single,
             })
             .default("")
             .build()
             .new_field("algo")
             .typ(Type::Select {
                 source: Source::Static(ALGOS),
-                multi: false,
+                typ: SelectType::Single,
             })
             .default(Algorithm::Aes256.as_str())
             .display_if_eq(
diff --git a/src/pages/config/edit.rs b/src/pages/config/edit.rs
index 141377b..e1fee29 100644
--- a/src/pages/config/edit.rs
+++ b/src/pages/config/edit.rs
@@ -14,15 +14,10 @@ use serde::{Deserialize, Serialize};
 use crate::{
     components::{
         form::{
-            button::Button,
-            expression::InputExpression,
-            input::{
+            button::Button, expression::InputExpression, input::{
                 InputDuration, InputPassword, InputRate, InputSize, InputSwitch, InputText,
                 TextArea,
-            },
-            select::{CheckboxGroup, Select, SelectCron},
-            stacked_input::StackedInput,
-            Form, FormButtonBar, FormElement, FormItem, FormSection,
+            }, select::{CheckboxGroup, Select, SelectCron}, stacked_badge::StackedBadge, stacked_input::StackedInput, Form, FormButtonBar, FormElement, FormItem, FormSection
         },
         icon::IconRefresh,
         messages::{
@@ -35,7 +30,7 @@ use crate::{
     core::{
         form::{ExternalSources, FormData},
         http::{self, HttpRequest},
-        oauth::use_authorization,
+        oauth::use_authorization, schema::SelectType,
     },
     pages::{
         config::{ReloadSettings, Schema, SchemaType, Schemas, Settings, Type, UpdateSettings},
@@ -410,7 +405,7 @@ pub fn SettingsEdit() -> impl IntoView {
                                                     }
                                                         .into_view()
                                                 }
-                                                Type::Select { multi: false, .. } => {
+                                                Type::Select { typ: SelectType::Single, .. } => {
                                                     view! {
                                                         <Select
                                                             element=FormElement::new(field.id, data)
@@ -419,7 +414,7 @@ pub fn SettingsEdit() -> impl IntoView {
                                                     }
                                                         .into_view()
                                                 }
-                                                Type::Select { multi: true, .. } => {
+                                                Type::Select { typ: SelectType::Many, .. } => {
                                                     view! {
                                                         <CheckboxGroup
                                                             element=FormElement::new(field.id, data)
@@ -428,6 +423,16 @@ pub fn SettingsEdit() -> impl IntoView {
                                                     }
                                                         .into_view()
                                                 }
+                                                Type::Select { typ: SelectType::ManyWithSearch, .. } => {
+                                                    view! {
+                                                        <StackedBadge
+                                                            element=FormElement::new(field.id, data)
+                                                            add_button_text="Add Event"
+                                                            color=Color::Green
+                                                        />
+                                                    }
+                                                        .into_view()
+                                                }
                                                 Type::Size => {
                                                     view! {
                                                         <InputSize element=FormElement::new(field.id, data)/>
diff --git a/src/pages/config/mod.rs b/src/pages/config/mod.rs
index 0a7288d..78e99c1 100644
--- a/src/pages/config/mod.rs
+++ b/src/pages/config/mod.rs
@@ -213,7 +213,7 @@ impl SettingsValues for Settings {
         match &field.typ_ {
             Type::Select {
                 source: Source::Static(items),
-                multi: false,
+                typ: SelectType::Single,
             } => {
                 let value = self
                     .get(field.id)
@@ -296,14 +296,18 @@ impl LayoutBuilder {
             .create("Cluster")
             .route("/cluster/edit")
             .insert()
-            // Logging
+            // Telemetry
+            .create("Telemetry")
             .create("Logging & Tracing")
             .route("/tracing")
             .insert()
-            // Logging
             .create("Webhooks")
             .route("/web-hooks")
             .insert()
+            .create("Custom levels")
+            .route("/custom-levels")
+            .insert()
+            .insert()
             // Cache
             .create("Cache")
             .route("/cache/edit")
diff --git a/src/pages/config/schema/auth.rs b/src/pages/config/schema/auth.rs
index 2f9d2ab..57df60e 100644
--- a/src/pages/config/schema/auth.rs
+++ b/src/pages/config/schema/auth.rs
@@ -27,7 +27,7 @@ impl Builder<Schemas, ()> {
             .help(concat!("Encryption algorithm used for the DKIM signature"))
             .default("ed25519-sha256")
             .typ(Type::Select {
-                multi: false,
+                typ: SelectType::Single,
                 source: Source::Static(&[
                     ("ed25519-sha256", "Ed25519 SHA-256"),
                     ("rsa-sha256", "RSA SHA-256"),
@@ -75,7 +75,7 @@ impl Builder<Schemas, ()> {
             ))
             .default("relaxed/relaxed")
             .typ(Type::Select {
-                multi: false,
+                typ: SelectType::Single,
                 source: Source::Static(&[
                     ("relaxed/relaxed", "Relaxed/Relaxed"),
                     ("simple/simple", "Simple/Simple"),
@@ -105,7 +105,7 @@ impl Builder<Schemas, ()> {
             ))
             .default("")
             .typ(Type::Select {
-                multi: false,
+                typ: SelectType::Single,
                 source: Source::Static(&[
                     ("", "Disabled"),
                     ("sha256", "SHA-256"),
diff --git a/src/pages/config/schema/authentication.rs b/src/pages/config/schema/authentication.rs
index cc06597..c680dd8 100644
--- a/src/pages/config/schema/authentication.rs
+++ b/src/pages/config/schema/authentication.rs
@@ -19,7 +19,7 @@ impl Builder<Schemas, ()> {
                     field: "type",
                     filter: Default::default(),
                 },
-                multi: false,
+                typ: SelectType::Single,
             })
             .input_check([], [Validator::Required])
             .build()
diff --git a/src/pages/config/schema/directory.rs b/src/pages/config/schema/directory.rs
index f1dc648..a8ad5d6 100644
--- a/src/pages/config/schema/directory.rs
+++ b/src/pages/config/schema/directory.rs
@@ -32,7 +32,7 @@ impl Builder<Schemas, ()> {
                     ("smtp", "SMTP Server"),
                     ("imap", "IMAP4 Server"),
                 ]),
-                multi: false,
+                typ: SelectType::Single,
             })
             .build()
             // Internal store
@@ -46,7 +46,7 @@ impl Builder<Schemas, ()> {
                     field: "type",
                     filter: Default::default(),
                 },
-                multi: false,
+                typ: SelectType::Single,
             })
             .source_filter_if_eq(
                 "type",
diff --git a/src/pages/config/schema/listener.rs b/src/pages/config/schema/listener.rs
index e931db9..31f195e 100644
--- a/src/pages/config/schema/listener.rs
+++ b/src/pages/config/schema/listener.rs
@@ -20,7 +20,7 @@ impl Builder<Schemas, ()> {
             // Type
             .new_field("protocol")
             .typ(Type::Select {
-                multi: false,
+                typ: SelectType::Single,
                 source: Source::Static(&[
                     ("smtp", "SMTP"),
                     ("lmtp", "LMTP"),
diff --git a/src/pages/config/schema/server.rs b/src/pages/config/schema/server.rs
index 70c538b..ed094fd 100644
--- a/src/pages/config/schema/server.rs
+++ b/src/pages/config/schema/server.rs
@@ -6,7 +6,7 @@
 
 use crate::core::schema::*;
 
-use super::CONNECTION_VARS;
+use super::{tracing::EVENT_NAMES, CONNECTION_VARS};
 
 impl Builder<Schemas, ()> {
     pub fn build_server(self) -> Self {
@@ -139,11 +139,12 @@ impl Builder<Schemas, ()> {
                     "store.*",
                     "directory.*",
                     "tracer.*",
-                    "server.*",
                     "!server.blocked-ip.*",
                     "!server.allowed-ip.*",
+                    "server.*",
                     "certificate.*",
-                    "cluster.node-id",
+                    "!cluster.key",
+                    "cluster.*",
                     "storage.data",
                     "storage.blob",
                     "storage.lookup",
@@ -460,8 +461,8 @@ impl Builder<Schemas, ()> {
             .label("Events")
             .help("Which events should trigger this webhook")
             .typ(Type::Select {
-                multi: true,
-                source: Source::Static(WEBHOOK_EVENTS),
+                typ: SelectType::ManyWithSearch,
+                source: Source::StaticId(EVENT_NAMES),
             })
             .build()
             .new_form_section()
@@ -487,23 +488,6 @@ impl Builder<Schemas, ()> {
     }
 }
 
-pub static WEBHOOK_EVENTS: &[(&str, &str)] = &[
-    ("auth.success", "Authentication success"),
-    ("auth.failure", "Authentication failure"),
-    ("auth.banned", "Authentication ban"),
-    ("auth.error", "Authentication error"),
-    ("message.accepted", "Message accepted"),
-    ("message.rejected", "Message rejected"),
-    ("message.appended", "Message appended"),
-    ("account.over-quota", "Account over quota"),
-    ("dsn", "Delivery status notification"),
-    ("double-bounce", "Double bounce"),
-    ("report.incoming.dmarc", "Incoming DMARC report"),
-    ("report.incoming.tls", "Incoming TLS report"),
-    ("report.incoming.arf", "Incoming ARF report"),
-    ("report.outgoing", "Outgoing report"),
-];
-
 impl Builder<Schemas, Schema> {
     pub fn add_network_fields(self, is_listener: bool) -> Self {
         let do_override: &'static [&'static str] =
diff --git a/src/pages/config/schema/smtp.rs b/src/pages/config/schema/smtp.rs
index 092f528..f750904 100644
--- a/src/pages/config/schema/smtp.rs
+++ b/src/pages/config/schema/smtp.rs
@@ -389,7 +389,7 @@ impl Builder<Schemas, ()> {
             .help(concat!("Resolver to use for DNS resolution"))
             .default("system")
             .typ(Type::Select {
-                multi: false,
+                typ: SelectType::Single,
                 source: Source::Static(&[
                     ("system", "System Resolver"),
                     ("custom", "Custom DNS"),
@@ -572,7 +572,7 @@ impl Builder<Schemas, ()> {
                 "server, which can be either SMTP or LMTP"
             ))
             .typ(Type::Select {
-                multi: false,
+                typ: SelectType::Single,
                 source: Source::Static(&[("smtp", "SMTP"), ("lmtp", "LMTP")]),
             })
             .default("smtp")
@@ -646,7 +646,7 @@ impl Builder<Schemas, ()> {
                 "where this throttle should be applied"
             ))
             .typ(Type::Select {
-                multi: true,
+                typ: SelectType::Many,
                 source: Source::Static(&[
                     (V_MX, "MX Host"),
                     (V_REMOTE_IP, "Remote IP"),
@@ -722,7 +722,7 @@ impl Builder<Schemas, ()> {
                 "where this quota should be applied"
             ))
             .typ(Type::Select {
-                multi: true,
+                typ: SelectType::Many,
                 source: Source::Static(&[
                     (V_SENDER, "Sender"),
                     (V_SENDER_DOMAIN, "Sender Domain"),
@@ -1340,7 +1340,7 @@ impl Builder<Schemas, ()> {
                 "where this throttle should be applied"
             ))
             .typ(Type::Select {
-                multi: true,
+                typ: SelectType::Many,
                 source: Source::Static(&[
                     (V_LISTENER, "Listener"),
                     (V_REMOTE_IP, "Remote IP"),
@@ -1518,7 +1518,7 @@ impl Builder<Schemas, ()> {
             ))
             .default("6")
             .typ(Type::Select {
-                multi: false,
+                typ: SelectType::Single,
                 source: Source::Static(&[("2", "Version 2"), ("6", "Version 6")]),
             })
             .input_check([], [Validator::Required])
@@ -1527,7 +1527,7 @@ impl Builder<Schemas, ()> {
             .label("Run on stages")
             .help("Which SMTP stages to run the milter on")
             .typ(Type::Select {
-                multi: true,
+                typ: SelectType::Many,
                 source: Source::Static(SMTP_STAGES),
             })
             .default("data")
@@ -1655,7 +1655,7 @@ impl Builder<Schemas, ()> {
             .label("Run on stages")
             .help("Which SMTP stages to run this hook on")
             .typ(Type::Select {
-                multi: true,
+                typ: SelectType::Many,
                 source: Source::Static(SMTP_STAGES),
             })
             .default("data")
@@ -1725,7 +1725,7 @@ impl Builder<Schemas, ()> {
             .new_schema("smtp-in-mta-sts")
             .new_field("session.mta-sts.mode")
             .typ(Type::Select {
-                multi: false,
+                typ: SelectType::Single,
                 source: Source::Static(&[
                     ("enforce", "Enforce"),
                     ("testing", "Testing"),
diff --git a/src/pages/config/schema/spamlists.rs b/src/pages/config/schema/spamlists.rs
index 5ee9b00..daa2c9c 100644
--- a/src/pages/config/schema/spamlists.rs
+++ b/src/pages/config/schema/spamlists.rs
@@ -135,7 +135,7 @@ impl Builder<Schemas, ()> {
                     field: "type",
                     filter: Default::default(),
                 },
-                multi: false,
+                typ: SelectType::Single,
             })
             .build()
             .new_field("lookup.spam-config.lookup")
@@ -147,7 +147,7 @@ impl Builder<Schemas, ()> {
                     field: "type",
                     filter: Default::default(),
                 },
-                multi: false,
+                typ: SelectType::Single,
             })
             .source_filter(&[
                 "foundationdb",
diff --git a/src/pages/config/schema/storage.rs b/src/pages/config/schema/storage.rs
index 22af31b..63efbf3 100644
--- a/src/pages/config/schema/storage.rs
+++ b/src/pages/config/schema/storage.rs
@@ -22,7 +22,7 @@ impl Builder<Schemas, ()> {
                     field: "type",
                     filter: Default::default(),
                 },
-                multi: false,
+                typ: SelectType::Single,
             })
             .source_filter(&["foundationdb", "mysql", "postgresql", "sqlite", "rocksdb"])
             .input_check([], [Validator::Required])
@@ -39,7 +39,7 @@ impl Builder<Schemas, ()> {
                     field: "type",
                     filter: Default::default(),
                 },
-                multi: false,
+                typ: SelectType::Single,
             })
             .source_filter(&[
                 "foundationdb",
@@ -64,7 +64,7 @@ impl Builder<Schemas, ()> {
                     field: "type",
                     filter: Default::default(),
                 },
-                multi: false,
+                typ: SelectType::Single,
             })
             .source_filter(&[
                 "foundationdb",
@@ -88,7 +88,7 @@ impl Builder<Schemas, ()> {
                     field: "type",
                     filter: Default::default(),
                 },
-                multi: false,
+                typ: SelectType::Single,
             })
             .source_filter(&[
                 "foundationdb",
diff --git a/src/pages/config/schema/store.rs b/src/pages/config/schema/store.rs
index dbc1d3d..ffb0693 100644
--- a/src/pages/config/schema/store.rs
+++ b/src/pages/config/schema/store.rs
@@ -65,7 +65,7 @@ impl Builder<Schemas, ()> {
                     ("elasticsearch", "ElasticSearch"),
                     ("fs", "Filesystem"),
                 ]),
-                multi: false,
+                typ: SelectType::Single,
             })
             .build()
             // Compression
@@ -76,7 +76,7 @@ impl Builder<Schemas, ()> {
             .default("lz4")
             .typ(Type::Select {
                 source: Source::Static(&[("none", "None"), ("lz4", "LZ4")]),
-                multi: false,
+                typ: SelectType::Single,
             })
             .display_if_ne("type", ["redis", "memory", "elasticsearch", "s3"])
             .build()
@@ -132,7 +132,7 @@ impl Builder<Schemas, ()> {
                     ("single", "Redis single node"),
                     ("cluster", "Redis Cluster"),
                 ]),
-                multi: false,
+                typ: SelectType::Single,
             })
             .build()
             // Username
diff --git a/src/pages/config/schema/tls.rs b/src/pages/config/schema/tls.rs
index 3a3f71a..bb82213 100644
--- a/src/pages/config/schema/tls.rs
+++ b/src/pages/config/schema/tls.rs
@@ -70,7 +70,7 @@ impl Builder<Schemas, ()> {
                     ("dns-01", "DNS-01"),
                     ("http-01", "HTTP-01"),
                 ]),
-                multi: false,
+                typ: SelectType::Single,
             })
             .label("Challenge type")
             .help("The ACME challenge type used to validate domain ownership")
@@ -103,7 +103,7 @@ impl Builder<Schemas, ()> {
                     ("rfc2136-tsig", "RFC2136"),
                     ("cloudflare", "Cloudflare"),
                 ]),
-                multi: false,
+                typ: SelectType::Single,
             })
             .label("DNS Provider")
             .help("The DNS provider used to manage DNS records for the DNS-01 challenge")
@@ -143,7 +143,7 @@ impl Builder<Schemas, ()> {
                     ("hmac-sha512", "HMAC-SHA512"),
                     ("hmac-sha512-256", "HMAC-SHA512-256"),
                 ]),
-                multi: false,
+                typ: SelectType::Single,
             })
             .label("TSIG Algorithm")
             .help("The TSIG algorithm used to authenticate with the DNS provider")
@@ -154,7 +154,7 @@ impl Builder<Schemas, ()> {
             .new_field("protocol")
             .typ(Type::Select {
                 source: Source::Static(&[("udp", "UDP"), ("tcp", "TCP")]),
-                multi: false,
+                typ: SelectType::Single,
             })
             .label("Protocol")
             .help("The protocol used to communicate with the DNS server")
@@ -345,7 +345,7 @@ impl Builder<Schemas, Schema> {
         .label("Disabled Protocols")
         .help("Which TLS protocols to disable")
         .typ(Type::Select {
-            multi: true,
+            typ: SelectType::Many,
             source: Source::Static(TLS_PROTOCOLS),
         })
         .display_if_eq("tls.override", do_override.iter().copied())
@@ -359,7 +359,7 @@ impl Builder<Schemas, Schema> {
         .label("Disabled Ciphersuites")
         .help("Which ciphersuites to disable")
         .typ(Type::Select {
-            multi: true,
+            typ: SelectType::Many,
             source: Source::Static(TLS_CIPHERSUITES),
         })
         .display_if_eq("tls.override", do_override.iter().copied())
diff --git a/src/pages/config/schema/tracing.rs b/src/pages/config/schema/tracing.rs
index d90cd15..b3faf20 100644
--- a/src/pages/config/schema/tracing.rs
+++ b/src/pages/config/schema/tracing.rs
@@ -14,16 +14,16 @@ impl Builder<Schemas, ()> {
             .suffix("type")
             // Id
             .new_id_field()
-            .label("Logger Id")
+            .label("Tracer Id")
             .help("Unique identifier for the tracer")
             .build()
             // Type
             .new_field("type")
             .typ(Type::Select {
-                multi: false,
+                typ: SelectType::Single,
                 source: Source::Static(&[
                     ("log", "Log file"),
-                    ("stdout", "Standard output"),
+                    ("stdout", "Console"),
                     ("journal", "Systemd Journal"),
                     ("open-telemetry", "Open Telemetry"),
                 ]),
@@ -36,7 +36,7 @@ impl Builder<Schemas, ()> {
             // Level
             .new_field("level")
             .typ(Type::Select {
-                multi: false,
+                typ: SelectType::Single,
                 source: Source::Static(&[
                     ("error", "Error - Only errors are logged"),
                     ("warn", "Warning - Errors and warnings are logged"),
@@ -63,14 +63,46 @@ impl Builder<Schemas, ()> {
             .help("Enable or disable the tracer")
             .default("true")
             .build()
-            // Enable
+            // ANSI
             .new_field("ansi")
             .typ(Type::Boolean)
-            .label("Use ANSI colors in logs")
+            .label("Use ANSI colors")
             .help("Whether to use ANSI colors in logs")
             .display_if_eq("type", ["log", "stdout"])
             .default("false")
             .build()
+            // Multiline
+            .new_field("multiline")
+            .typ(Type::Boolean)
+            .label("Multiline entries")
+            .help("Whether to write log entries as a single line or multiline")
+            .display_if_eq("type", ["log", "stdout"])
+            .default("false")
+            .build()
+            // Buffered
+            .new_field("buffered")
+            .typ(Type::Boolean)
+            .label("Buffered writes")
+            .help("Whether to buffer log entries before writing to console")
+            .display_if_eq("type", ["stdout"])
+            .default("true")
+            .build()
+            // Lossy
+            .new_field("lossy")
+            .typ(Type::Boolean)
+            .label("Lossy mode")
+            .help("Whether to drop log entries if there is backlog")
+            .default("false")
+            .build()
+            // Disabled events
+            .new_field("disabled-events")
+            .label("Disabled Events")
+            .help("Which events to disable for this tracer")
+            .typ(Type::Select {
+                typ: SelectType::ManyWithSearch,
+                source: Source::StaticId(EVENT_NAMES),
+            })
+            .build()
             // Log Path
             .new_field("path")
             .typ(Type::Input)
@@ -92,7 +124,7 @@ impl Builder<Schemas, ()> {
             // Log Rotate
             .new_field("rotate")
             .typ(Type::Select {
-                multi: false,
+                typ: SelectType::Single,
                 source: Source::Static(&[
                     ("daily", "Daily"),
                     ("hourly", "Hourly"),
@@ -109,7 +141,7 @@ impl Builder<Schemas, ()> {
             // OT Transport
             .new_field("transport")
             .typ(Type::Select {
-                multi: false,
+                typ: SelectType::Single,
                 source: Source::Static(&[("http", "HTTP"), ("grpc", "gRPC")]),
             })
             .label("Transport")
@@ -134,26 +166,646 @@ impl Builder<Schemas, ()> {
             .help("The headers to be sent with OpenTelemetry requests")
             .display_if_eq("transport", ["http"])
             .build()
+            // OT Timeout
+            .new_field("timeout")
+            .label("Timeout")
+            .help(concat!(
+                "Maximum amount of time that Stalwart will wait for a response ",
+                "from the OpenTelemetry endpoint"
+            ))
+            .default("10s")
+            .typ(Type::Duration)
+            .display_if_eq("type", ["open-telemetry"])
+            .input_check([], [Validator::Required])
+            .build()
+            // OT Throttle
+            .new_field("throttle")
+            .label("Throttle")
+            .help(concat!(
+                "The minimum amount of time that must pass between ",
+                "each request to the OpenTelemetry endpoint"
+            ))
+            .default("1s")
+            .display_if_eq("type", ["open-telemetry"])
+            .typ(Type::Duration)
+            .input_check([], [Validator::Required])
+            .build()
+            // OT Export Logs
+            .new_field("enable.log-exporter")
+            .typ(Type::Boolean)
+            .label("Export logs")
+            .help("Whether to export logs to OpenTelemetry")
+            .display_if_eq("type", ["open-telemetry"])
+            .default("true")
+            .build()
+            // OT Export Spans
+            .new_field("enable.span-exporter")
+            .typ(Type::Boolean)
+            .label("Export spans")
+            .help("Whether to export spans to OpenTelemetry")
+            .display_if_eq("type", ["open-telemetry"])
+            .default("true")
+            .build()
             // Forms
             .new_form_section()
-            .title("Logger settings")
+            .title("Tracer configuration")
+            .fields(["_id", "type", "level", "enable"])
+            .build()
+            .new_form_section()
+            .title("Options")
             .fields([
-                "_id",
-                "type",
-                "level",
                 "path",
                 "prefix",
                 "rotate",
                 "transport",
                 "endpoint",
+                "timeout",
+                "throttle",
                 "headers",
+                "enable.log-exporter",
+                "enable.span-exporter",
                 "ansi",
-                "enable",
+                "multiline",
+                "buffered",
+                "lossy",
             ])
             .build()
-            .list_title("Logging methods")
+            .new_form_section()
+            .title("Override events")
+            .fields(["disabled-events"])
+            .build()
+            .list_title("Logging & tracing methods")
             .list_subtitle("Manage logging and tracing methods")
             .list_fields(["_id", "type", "level", "enable"])
             .build()
+            // Custom levels
+            .new_schema("custom-levels")
+            .names("event", "events")
+            .prefix("tracing.level")
+            // Id
+            .new_field("_id")
+            .readonly()
+            .label("Event Id")
+            .help("Unique identifier of the event")
+            .typ(Type::Select {
+                typ: SelectType::Single,
+                source: Source::StaticId(EVENT_NAMES),
+            })
+            .build()
+            // Level
+            .new_field("_value")
+            .typ(Type::Select {
+                typ: SelectType::Single,
+                source: Source::Static(&[
+                    ("disable", "Disabled"),
+                    ("error", "Error"),
+                    ("warn", "Warning"),
+                    ("info", "Info"),
+                    ("debug", "Debug"),
+                    ("trace", "Trace"),
+                ]),
+            })
+            .label("Level")
+            .help("The logging level for this event")
+            .input_check([], [Validator::Required])
+            .default("info")
+            .build()
+            .new_form_section()
+            .fields(["_id", "_value"])
+            .build()
+            .list_title("Custom event levels")
+            .list_subtitle("Manage custom event logging levels")
+            .list_fields(["_id", "_value"])
+            .build()
     }
 }
+
+pub static EVENT_NAMES: &[&str] = &[
+    "acme.auth-completed",
+    "acme.auth-error",
+    "acme.auth-pending",
+    "acme.auth-start",
+    "acme.auth-too-many-attempts",
+    "acme.auth-valid",
+    "acme.client-missing-sni",
+    "acme.client-supplied-sni",
+    "acme.dns-record-created",
+    "acme.dns-record-creation-failed",
+    "acme.dns-record-deletion-failed",
+    "acme.dns-record-lookup-failed",
+    "acme.dns-record-not-propagated",
+    "acme.dns-record-propagated",
+    "acme.dns-record-propagation-timeout",
+    "acme.error",
+    "acme.order-completed",
+    "acme.order-invalid",
+    "acme.order-processing",
+    "acme.order-ready",
+    "acme.order-start",
+    "acme.order-valid",
+    "acme.process-cert",
+    "acme.renew-backoff",
+    "acme.tls-alpn-error",
+    "acme.tls-alpn-received",
+    "acme.token-not-found",
+    "arc.broken-chain",
+    "arc.chain-too-long",
+    "arc.has-header-tag",
+    "arc.invalid-cv",
+    "arc.invalid-instance",
+    "arc.sealer-not-found",
+    "auth.banned",
+    "auth.error",
+    "auth.failed",
+    "auth.missing-totp",
+    "auth.success",
+    "auth.too-many-attempts",
+    "cluster.decryption-error",
+    "cluster.empty-packet",
+    "cluster.error",
+    "cluster.invalid-packet",
+    "cluster.one-or-more-peers-offline",
+    "cluster.peer-alive",
+    "cluster.peer-back-online",
+    "cluster.peer-discovered",
+    "cluster.peer-has-config-changes",
+    "cluster.peer-has-list-changes",
+    "cluster.peer-leaving",
+    "cluster.peer-offline",
+    "cluster.peer-suspected",
+    "cluster.peer-suspected-is-alive",
+    "config.already-up-to-date",
+    "config.build-error",
+    "config.build-warning",
+    "config.default-applied",
+    "config.external-key-ignored",
+    "config.fetch-error",
+    "config.import-external",
+    "config.macro-error",
+    "config.missing-setting",
+    "config.parse-error",
+    "config.parse-warning",
+    "config.unused-setting",
+    "config.write-error",
+    "dane.authentication-failure",
+    "dane.authentication-success",
+    "dane.certificate-parse-error",
+    "dane.no-certificates-found",
+    "dane.tlsa-record-fetch",
+    "dane.tlsa-record-fetch-error",
+    "dane.tlsa-record-invalid",
+    "dane.tlsa-record-match",
+    "dane.tlsa-record-not-dnssec-signed",
+    "dane.tlsa-record-not-found",
+    "delivery.attempt-end",
+    "delivery.attempt-start",
+    "delivery.auth",
+    "delivery.auth-failed",
+    "delivery.completed",
+    "delivery.concurrency-limit-exceeded",
+    "delivery.connect",
+    "delivery.connect-error",
+    "delivery.delivered",
+    "delivery.domain-delivery-start",
+    "delivery.double-bounce",
+    "delivery.dsn-perm-fail",
+    "delivery.dsn-success",
+    "delivery.dsn-temp-fail",
+    "delivery.ehlo",
+    "delivery.ehlo-rejected",
+    "delivery.failed",
+    "delivery.greeting-failed",
+    "delivery.implicit-tls-error",
+    "delivery.ip-lookup",
+    "delivery.ip-lookup-failed",
+    "delivery.mail-from",
+    "delivery.mail-from-rejected",
+    "delivery.message-rejected",
+    "delivery.missing-outbound-hostname",
+    "delivery.mx-lookup",
+    "delivery.mx-lookup-failed",
+    "delivery.null-mx",
+    "delivery.rate-limit-exceeded",
+    "delivery.raw-input",
+    "delivery.raw-output",
+    "delivery.rcpt-to",
+    "delivery.rcpt-to-failed",
+    "delivery.rcpt-to-rejected",
+    "delivery.start-tls",
+    "delivery.start-tls-disabled",
+    "delivery.start-tls-error",
+    "delivery.start-tls-unavailable",
+    "dkim.fail",
+    "dkim.failed-auid-match",
+    "dkim.failed-body-hash-match",
+    "dkim.failed-verification",
+    "dkim.incompatible-algorithms",
+    "dkim.neutral",
+    "dkim.none",
+    "dkim.pass",
+    "dkim.perm-error",
+    "dkim.revoked-public-key",
+    "dkim.signature-expired",
+    "dkim.signature-length",
+    "dkim.signer-not-found",
+    "dkim.temp-error",
+    "dkim.unsupported-algorithm",
+    "dkim.unsupported-canonicalization",
+    "dkim.unsupported-key-type",
+    "dkim.unsupported-version",
+    "dmarc.fail",
+    "dmarc.none",
+    "dmarc.pass",
+    "dmarc.perm-error",
+    "dmarc.temp-error",
+    "eval.directory-not-found",
+    "eval.error",
+    "eval.result",
+    "eval.store-not-found",
+    "fts-index.blob-not-found",
+    "fts-index.index",
+    "fts-index.lock-busy",
+    "fts-index.locked",
+    "fts-index.metadata-not-found",
+    "housekeeper.purge-accounts",
+    "housekeeper.purge-sessions",
+    "housekeeper.purge-store",
+    "housekeeper.schedule",
+    "housekeeper.start",
+    "housekeeper.stop",
+    "http.error",
+    "http.request-body",
+    "http.request-url",
+    "http.response-body",
+    "http.x-forwarded-missing",
+    "imap.append",
+    "imap.capabilities",
+    "imap.close",
+    "imap.copy",
+    "imap.create-mailbox",
+    "imap.delete-mailbox",
+    "imap.enable",
+    "imap.error",
+    "imap.expunge",
+    "imap.fetch",
+    "imap.get-acl",
+    "imap.id",
+    "imap.idle-start",
+    "imap.idle-stop",
+    "imap.list",
+    "imap.list-rights",
+    "imap.logout",
+    "imap.lsub",
+    "imap.move",
+    "imap.my-rights",
+    "imap.namespace",
+    "imap.noop",
+    "imap.raw-input",
+    "imap.raw-output",
+    "imap.rename-mailbox",
+    "imap.search",
+    "imap.select",
+    "imap.set-acl",
+    "imap.sort",
+    "imap.status",
+    "imap.store",
+    "imap.subscribe",
+    "imap.thread",
+    "imap.unsubscribe",
+    "incoming-report.abuse-report",
+    "incoming-report.arf-parse-failed",
+    "incoming-report.auth-failure-report",
+    "incoming-report.decompress-error",
+    "incoming-report.dmarc-parse-failed",
+    "incoming-report.dmarc-report",
+    "incoming-report.dmarc-report-with-warnings",
+    "incoming-report.fraud-report",
+    "incoming-report.message-parse-failed",
+    "incoming-report.not-spam-report",
+    "incoming-report.other-report",
+    "incoming-report.tls-report",
+    "incoming-report.tls-report-with-warnings",
+    "incoming-report.tls-rpc-parse-failed",
+    "incoming-report.virus-report",
+    "iprev.fail",
+    "iprev.none",
+    "iprev.pass",
+    "iprev.perm-error",
+    "iprev.temp-error",
+    "jmap.account-not-found",
+    "jmap.account-not-supported-by-method",
+    "jmap.account-read-only",
+    "jmap.anchor-not-found",
+    "jmap.cannot-calculate-changes",
+    "jmap.forbidden",
+    "jmap.invalid-arguments",
+    "jmap.invalid-result-reference",
+    "jmap.method-call",
+    "jmap.not-found",
+    "jmap.not-json",
+    "jmap.not-request",
+    "jmap.request-too-large",
+    "jmap.state-mismatch",
+    "jmap.unknown-capability",
+    "jmap.unknown-data-type",
+    "jmap.unknown-method",
+    "jmap.unsupported-filter",
+    "jmap.unsupported-sort",
+    "jmap.websocket-error",
+    "jmap.websocket-start",
+    "jmap.websocket-stop",
+    "limit.blob-quota",
+    "limit.calls-in",
+    "limit.concurrent-connection",
+    "limit.concurrent-request",
+    "limit.concurrent-upload",
+    "limit.quota",
+    "limit.size-request",
+    "limit.size-upload",
+    "limit.too-many-requests",
+    "mail-auth.base64",
+    "mail-auth.crypto",
+    "mail-auth.dns-error",
+    "mail-auth.dns-invalid-record-type",
+    "mail-auth.dns-record-not-found",
+    "mail-auth.io",
+    "mail-auth.missing-parameters",
+    "mail-auth.no-headers-found",
+    "mail-auth.parse-error",
+    "mail-auth.policy-not-aligned",
+    "manage-sieve.capabilities",
+    "manage-sieve.check-script",
+    "manage-sieve.create-script",
+    "manage-sieve.delete-script",
+    "manage-sieve.error",
+    "manage-sieve.get-script",
+    "manage-sieve.have-space",
+    "manage-sieve.list-scripts",
+    "manage-sieve.logout",
+    "manage-sieve.noop",
+    "manage-sieve.raw-input",
+    "manage-sieve.raw-output",
+    "manage-sieve.rename-script",
+    "manage-sieve.set-active",
+    "manage-sieve.start-tls",
+    "manage-sieve.unauthenticate",
+    "manage-sieve.update-script",
+    "manage.already-exists",
+    "manage.assert-failed",
+    "manage.error",
+    "manage.missing-parameter",
+    "manage.not-found",
+    "manage.not-supported",
+    "milter.action-accept",
+    "milter.action-connection-failure",
+    "milter.action-discard",
+    "milter.action-reject",
+    "milter.action-reply-code",
+    "milter.action-shutdown",
+    "milter.action-temp-fail",
+    "milter.disconnected",
+    "milter.frame-invalid",
+    "milter.frame-too-large",
+    "milter.io-error",
+    "milter.parse-error",
+    "milter.read",
+    "milter.timeout",
+    "milter.tls-invalid-name",
+    "milter.unexpected-response",
+    "milter.write",
+    "mta-hook.action-accept",
+    "mta-hook.action-discard",
+    "mta-hook.action-quarantine",
+    "mta-hook.action-reject",
+    "mta-hook.error",
+    "mta-sts.authorized",
+    "mta-sts.invalid-policy",
+    "mta-sts.not-authorized",
+    "mta-sts.policy-fetch",
+    "mta-sts.policy-fetch-error",
+    "mta-sts.policy-not-found",
+    "network.accept-error",
+    "network.bind-error",
+    "network.closed",
+    "network.connection-end",
+    "network.connection-start",
+    "network.drop-blocked",
+    "network.flush-error",
+    "network.listen-error",
+    "network.listen-start",
+    "network.listen-stop",
+    "network.proxy-error",
+    "network.read-error",
+    "network.set-opt-error",
+    "network.split-error",
+    "network.timeout",
+    "network.write-error",
+    "outgoing-report.dkim-rate-limited",
+    "outgoing-report.dkim-report",
+    "outgoing-report.dmarc-aggregate-report",
+    "outgoing-report.dmarc-rate-limited",
+    "outgoing-report.dmarc-report",
+    "outgoing-report.http-submission",
+    "outgoing-report.lock-busy",
+    "outgoing-report.lock-deleted",
+    "outgoing-report.locked",
+    "outgoing-report.no-recipients-found",
+    "outgoing-report.not-found",
+    "outgoing-report.reporting-address-validation-error",
+    "outgoing-report.spf-rate-limited",
+    "outgoing-report.spf-report",
+    "outgoing-report.submission-error",
+    "outgoing-report.tls-aggregate",
+    "outgoing-report.unauthorized-reporting-address",
+    "pop3.capabilities",
+    "pop3.delete",
+    "pop3.error",
+    "pop3.fetch",
+    "pop3.list",
+    "pop3.list-message",
+    "pop3.noop",
+    "pop3.quit",
+    "pop3.raw-input",
+    "pop3.raw-output",
+    "pop3.reset",
+    "pop3.start-tls",
+    "pop3.stat",
+    "pop3.uidl",
+    "pop3.uidl-message",
+    "pop3.utf8",
+    "purge.auto-expunge",
+    "purge.error",
+    "purge.finished",
+    "purge.purge-active",
+    "purge.running",
+    "purge.started",
+    "purge.tombstone-cleanup",
+    "push-subscription.error",
+    "push-subscription.not-found",
+    "push-subscription.success",
+    "queue.blob-not-found",
+    "queue.concurrency-limit-exceeded",
+    "queue.lock-busy",
+    "queue.locked",
+    "queue.quota-exceeded",
+    "queue.rate-limit-exceeded",
+    "queue.rescheduled",
+    "queue.scheduled",
+    "resource.bad-parameters",
+    "resource.download-external",
+    "resource.error",
+    "resource.not-found",
+    "resource.webadmin-unpacked",
+    "server.licensing",
+    "server.shutdown",
+    "server.startup",
+    "server.startup-error",
+    "server.thread-error",
+    "sieve.action-accept",
+    "sieve.action-accept-replace",
+    "sieve.action-discard",
+    "sieve.action-reject",
+    "sieve.list-not-found",
+    "sieve.message-too-large",
+    "sieve.not-supported",
+    "sieve.quota-exceeded",
+    "sieve.runtime-error",
+    "sieve.script-not-found",
+    "sieve.send-message",
+    "sieve.unexpected-error",
+    "smtp.already-authenticated",
+    "smtp.arc-fail",
+    "smtp.arc-pass",
+    "smtp.auth-exchange-too-long",
+    "smtp.auth-mechanism-not-supported",
+    "smtp.auth-not-allowed",
+    "smtp.command-not-implemented",
+    "smtp.concurrency-limit-exceeded",
+    "smtp.deliver-by-disabled",
+    "smtp.deliver-by-invalid",
+    "smtp.did-not-say-ehlo",
+    "smtp.dkim-fail",
+    "smtp.dkim-pass",
+    "smtp.dmarc-fail",
+    "smtp.dmarc-pass",
+    "smtp.dsn-disabled",
+    "smtp.ehlo",
+    "smtp.ehlo-expected",
+    "smtp.error",
+    "smtp.expn",
+    "smtp.expn-disabled",
+    "smtp.expn-not-found",
+    "smtp.future-release-disabled",
+    "smtp.future-release-invalid",
+    "smtp.help",
+    "smtp.invalid-command",
+    "smtp.invalid-ehlo",
+    "smtp.invalid-parameter",
+    "smtp.invalid-recipient-address",
+    "smtp.invalid-sender-address",
+    "smtp.iprev-fail",
+    "smtp.iprev-pass",
+    "smtp.lhlo-expected",
+    "smtp.loop-detected",
+    "smtp.mail-from",
+    "smtp.mail-from-missing",
+    "smtp.mail-from-rewritten",
+    "smtp.mail-from-unauthenticated",
+    "smtp.mail-from-unauthorized",
+    "smtp.mailbox-does-not-exist",
+    "smtp.message-parse-failed",
+    "smtp.message-too-large",
+    "smtp.missing-auth-directory",
+    "smtp.missing-local-hostname",
+    "smtp.mt-priority-disabled",
+    "smtp.mt-priority-invalid",
+    "smtp.multiple-mail-from",
+    "smtp.noop",
+    "smtp.pipe-error",
+    "smtp.pipe-success",
+    "smtp.quit",
+    "smtp.rate-limit-exceeded",
+    "smtp.raw-input",
+    "smtp.raw-output",
+    "smtp.rcpt-to",
+    "smtp.rcpt-to-duplicate",
+    "smtp.rcpt-to-missing",
+    "smtp.rcpt-to-rewritten",
+    "smtp.relay-not-allowed",
+    "smtp.remote-id-not-found",
+    "smtp.request-too-large",
+    "smtp.require-tls-disabled",
+    "smtp.rset",
+    "smtp.spf-ehlo-fail",
+    "smtp.spf-ehlo-pass",
+    "smtp.spf-from-fail",
+    "smtp.spf-from-pass",
+    "smtp.start-tls",
+    "smtp.start-tls-already",
+    "smtp.start-tls-unavailable",
+    "smtp.syntax-error",
+    "smtp.time-limit-exceeded",
+    "smtp.too-many-invalid-rcpt",
+    "smtp.too-many-messages",
+    "smtp.too-many-recipients",
+    "smtp.transfer-limit-exceeded",
+    "smtp.unsupported-parameter",
+    "smtp.vrfy",
+    "smtp.vrfy-disabled",
+    "smtp.vrfy-not-found",
+    "spam.classify",
+    "spam.classify-error",
+    "spam.list-updated",
+    "spam.not-enough-training-data",
+    "spam.pyzor-error",
+    "spam.train",
+    "spam.train-balance",
+    "spam.train-error",
+    "spf.fail",
+    "spf.neutral",
+    "spf.none",
+    "spf.pass",
+    "spf.perm-error",
+    "spf.soft-fail",
+    "spf.temp-error",
+    "store.assert-value-failed",
+    "store.blob-missing-marker",
+    "store.crypto-error",
+    "store.data-corruption",
+    "store.decompress-error",
+    "store.deserialize-error",
+    "store.elasticsearch-error",
+    "store.filesystem-error",
+    "store.foundationdb-error",
+    "store.ingest",
+    "store.ingest-duplicate",
+    "store.ingest-error",
+    "store.ldap-bind",
+    "store.ldap-error",
+    "store.ldap-query",
+    "store.mysql-error",
+    "store.not-configured",
+    "store.not-found",
+    "store.not-supported",
+    "store.pool-error",
+    "store.postgresql-error",
+    "store.redis-error",
+    "store.rocksdb-error",
+    "store.s3-error",
+    "store.sql-query",
+    "store.sqlite-error",
+    "store.unexpected-error",
+    "tls-rpt.record-fetch",
+    "tls-rpt.record-fetch-error",
+    "tls.certificate-not-found",
+    "tls.handshake",
+    "tls.handshake-error",
+    "tls.multiple-certificates-available",
+    "tls.no-certificates-available",
+    "tls.not-configured",
+    "tracing.journal-error",
+    "tracing.log-error",
+    "tracing.otel-error",
+    "tracing.update",
+    "tracing.webhook-error",
+];
diff --git a/src/pages/directory/principals/edit.rs b/src/pages/directory/principals/edit.rs
index eee6df9..5474b83 100644
--- a/src/pages/directory/principals/edit.rs
+++ b/src/pages/directory/principals/edit.rs
@@ -29,7 +29,7 @@ use crate::{
         form::FormData,
         http::{self, HttpRequest},
         oauth::use_authorization,
-        schema::{Builder, Schemas, Source, Transformer, Type, Validator},
+        schema::{Builder, Schemas, SelectType, Source, Transformer, Type, Validator},
     },
     pages::directory::{Principal, PrincipalType},
 };
@@ -581,7 +581,7 @@ impl Builder<Schemas, ()> {
             .new_field("type")
             .typ(Type::Select {
                 source: Source::Static(IDS),
-                multi: false,
+                typ: SelectType::Single,
             })
             .default(PrincipalType::Individual.id())
             .build()
diff --git a/src/pages/manage/spam.rs b/src/pages/manage/spam.rs
index e12f126..5061a70 100644
--- a/src/pages/manage/spam.rs
+++ b/src/pages/manage/spam.rs
@@ -27,7 +27,7 @@ use crate::{
         form::FormValue,
         http::{Error, HttpRequest},
         oauth::use_authorization,
-        schema::{Builder, Schemas, Source, Transformer, Type, Validator},
+        schema::{Builder, Schemas, SelectType, Source, Transformer, Type, Validator},
     },
 };
 
@@ -416,56 +416,56 @@ impl Builder<Schemas, ()> {
             .build()
             .new_field("iprev.result")
             .typ(Type::Select {
-                multi: false,
+                typ: SelectType::Single,
                 source: Source::Static(IPREV_RESULT),
             })
             .default("none")
             .build()
             .new_field("spf.result")
             .typ(Type::Select {
-                multi: false,
+                typ: SelectType::Single,
                 source: Source::Static(SPF_RESULT),
             })
             .default("none")
             .build()
             .new_field("spf_ehlo.result")
             .typ(Type::Select {
-                multi: false,
+                typ: SelectType::Single,
                 source: Source::Static(SPF_RESULT),
             })
             .default("none")
             .build()
             .new_field("arc.result")
             .typ(Type::Select {
-                multi: false,
+                typ: SelectType::Single,
                 source: Source::Static(DKIM_RESULT),
             })
             .default("none")
             .build()
             .new_field("dkim.result")
             .typ(Type::Select {
-                multi: false,
+                typ: SelectType::Single,
                 source: Source::Static(DKIM_RESULT),
             })
             .default("none")
             .build()
             .new_field("dmarc.result")
             .typ(Type::Select {
-                multi: false,
+                typ: SelectType::Single,
                 source: Source::Static(DMARC_RESULT),
             })
             .default("none")
             .build()
             .new_field("dmarc.policy")
             .typ(Type::Select {
-                multi: false,
+                typ: SelectType::Single,
                 source: Source::Static(DMARC_POLICY),
             })
             .default("none")
             .build()
             .new_field("param.body")
             .typ(Type::Select {
-                multi: false,
+                typ: SelectType::Single,
                 source: Source::Static(MAIL_BODY),
             })
             .default("")
@@ -480,7 +480,7 @@ impl Builder<Schemas, ()> {
             .new_field("train")
             .default("spam")
             .typ(Type::Select {
-                multi: false,
+                typ: SelectType::Single,
                 source: Source::Static(&[("spam", "SPAM"), ("ham", "HAM")]),
             })
             .build()