diff --git a/src/icingadb-web/messages.pot b/src/icingadb-web/messages.pot
index da942265..d1de4f9b 100644
--- a/src/icingadb-web/messages.pot
+++ b/src/icingadb-web/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 410afaa\n"
+"Project-Id-Version: Icinga L10n 04dd51a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-10 12:12+0000\n"
+"POT-Creation-Date: 2023-08-20 11:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1697,7 +1697,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingadb-web/library/Icingadb/Common/BaseItemList.php:97
-#: sources.d/icingadb-web/library/Icingadb/Common/BaseItemTable.php:73
+#: sources.d/icingadb-web/library/Icingadb/Common/BaseItemTable.php:85
 #: sources.d/icingadb-web/library/Icingadb/Common/BaseOrderedItemList.php:31
 #: sources.d/icingadb-web/library/Icingadb/Widget/ItemTable/StateItemTable.php:190
 msgid "No items found."
@@ -3628,11 +3628,11 @@ msgstr ""
 msgid "Switch to detailed view"
 msgstr ""
 
-#: sources.d/icingadb-web/library/Icingadb/Web/Controller.php:422
+#: sources.d/icingadb-web/library/Icingadb/Web/Controller.php:438
 msgid "Page"
 msgstr ""
 
-#: sources.d/icingadb-web/library/Icingadb/Web/Controller.php:514
+#: sources.d/icingadb-web/library/Icingadb/Web/Controller.php:530
 msgid "This route does not support the requested output format"
 msgstr ""
 
diff --git a/src/icingaweb2-module-audit/messages.pot b/src/icingaweb2-module-audit/messages.pot
index dbbb6091..4774c1fa 100644
--- a/src/icingaweb2-module-audit/messages.pot
+++ b/src/icingaweb2-module-audit/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 410afaa\n"
+"Project-Id-Version: Icinga L10n 04dd51a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-10 12:12+0000\n"
+"POT-Creation-Date: 2023-08-20 11:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-aws/messages.pot b/src/icingaweb2-module-aws/messages.pot
index b00c97fb..ab9667c9 100644
--- a/src/icingaweb2-module-aws/messages.pot
+++ b/src/icingaweb2-module-aws/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 410afaa\n"
+"Project-Id-Version: Icinga L10n 04dd51a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-10 12:12+0000\n"
+"POT-Creation-Date: 2023-08-20 11:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-businessprocess/messages.pot b/src/icingaweb2-module-businessprocess/messages.pot
index e9ceda95..ee6f3db4 100644
--- a/src/icingaweb2-module-businessprocess/messages.pot
+++ b/src/icingaweb2-module-businessprocess/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 410afaa\n"
+"Project-Id-Version: Icinga L10n 04dd51a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-10 12:12+0000\n"
+"POT-Creation-Date: 2023-08-20 11:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-cube/messages.pot b/src/icingaweb2-module-cube/messages.pot
index 7390bcc2..20506863 100644
--- a/src/icingaweb2-module-cube/messages.pot
+++ b/src/icingaweb2-module-cube/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 410afaa\n"
+"Project-Id-Version: Icinga L10n 04dd51a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-10 12:12+0000\n"
+"POT-Creation-Date: 2023-08-20 11:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-director/messages.pot b/src/icingaweb2-module-director/messages.pot
index 663b3f13..fccd9efc 100644
--- a/src/icingaweb2-module-director/messages.pot
+++ b/src/icingaweb2-module-director/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 410afaa\n"
+"Project-Id-Version: Icinga L10n 04dd51a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-10 12:12+0000\n"
+"POT-Creation-Date: 2023-08-20 11:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -314,6 +314,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:384
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:395
+#: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:284
 #: sources.d/icingaweb2-module-director/application/forms/SelfServiceSettingsForm.php:252
 #: sources.d/icingaweb2-module-director/application/forms/SettingsForm.php:193
 #: sources.d/icingaweb2-module-director/application/views/helpers/FormDataFilter.php:465
@@ -1499,7 +1500,7 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldCategoryForm.php:31
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:158
 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:31
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceSetForm.php:103
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTemplateChoiceForm.php:56
 #: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:52
@@ -1581,16 +1582,18 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:149
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:126
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:83
 msgid "Caption"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:152
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:88
 msgid ""
 "The caption which should be displayed to your users when this field is shown"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:160
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:96
 msgid ""
 "An extended description for this field. Will be shown as soon as a user puts "
 "the focus on this field"
@@ -2636,64 +2639,44 @@ msgstr ""
 msgid "Check command definition"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
-msgid "Suggested fields"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:99
-msgid "Argument macros"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:104
-msgid "Other available fields"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:118
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:75
 msgid ""
 "There are no data fields available. Please ask an administrator to create "
 "such"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:130
-msgid "The caption which should be displayed"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:135
-msgid "A description about the field"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:148
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:106
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:111
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:51
 msgid "Mandatory"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:144
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:107
 msgid "Whether this field should be mandatory"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:110
 msgid "Optional"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:170
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:118
 msgid ""
 "You might want to show this field only when certain conditions are met. "
 "Otherwise it will not be available and values eventually set before will be "
 "cleared once stored"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:184
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:132
 msgid "Show based on filter"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:194
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:142
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:87
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:928
 msgid "Delete"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:197
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:145
 msgid "Field has been removed"
 msgstr ""
 
@@ -4963,6 +4946,22 @@ msgstr ""
 msgid "(Host) group resolve cache"
 msgstr ""
 
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:78
+msgid "Suggested fields"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:82
+msgid "Argument macros"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:86
+msgid "Flags (boolean) arguments"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:90
+msgid "Other available fields"
+msgstr ""
+
 #: sources.d/icingaweb2-module-director/library/Director/IcingaConfig/StateFilterSet.php:20
 msgid "Up"
 msgstr ""
diff --git a/src/icingaweb2-module-elasticsearch/messages.pot b/src/icingaweb2-module-elasticsearch/messages.pot
index f0c6b4d8..5223e022 100644
--- a/src/icingaweb2-module-elasticsearch/messages.pot
+++ b/src/icingaweb2-module-elasticsearch/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 410afaa\n"
+"Project-Id-Version: Icinga L10n 04dd51a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-10 12:12+0000\n"
+"POT-Creation-Date: 2023-08-20 11:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-graphite/messages.pot b/src/icingaweb2-module-graphite/messages.pot
index c0084672..196f5615 100644
--- a/src/icingaweb2-module-graphite/messages.pot
+++ b/src/icingaweb2-module-graphite/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 410afaa\n"
+"Project-Id-Version: Icinga L10n 04dd51a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-10 12:12+0000\n"
+"POT-Creation-Date: 2023-08-20 11:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-jira/messages.pot b/src/icingaweb2-module-jira/messages.pot
index e8409e61..6cb0be31 100644
--- a/src/icingaweb2-module-jira/messages.pot
+++ b/src/icingaweb2-module-jira/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 410afaa\n"
+"Project-Id-Version: Icinga L10n 04dd51a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-10 12:12+0000\n"
+"POT-Creation-Date: 2023-08-20 11:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-pdfexport/messages.pot b/src/icingaweb2-module-pdfexport/messages.pot
index 4ca938a6..ae1a2e4c 100644
--- a/src/icingaweb2-module-pdfexport/messages.pot
+++ b/src/icingaweb2-module-pdfexport/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 410afaa\n"
+"Project-Id-Version: Icinga L10n 04dd51a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-10 12:12+0000\n"
+"POT-Creation-Date: 2023-08-20 11:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-reporting/messages.pot b/src/icingaweb2-module-reporting/messages.pot
index 5b87e66b..b19e20f4 100644
--- a/src/icingaweb2-module-reporting/messages.pot
+++ b/src/icingaweb2-module-reporting/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 410afaa\n"
+"Project-Id-Version: Icinga L10n 04dd51a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-10 12:12+0000\n"
+"POT-Creation-Date: 2023-08-20 11:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-vspheredb/messages.pot b/src/icingaweb2-module-vspheredb/messages.pot
index 545befdc..994d1638 100644
--- a/src/icingaweb2-module-vspheredb/messages.pot
+++ b/src/icingaweb2-module-vspheredb/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 410afaa\n"
+"Project-Id-Version: Icinga L10n 04dd51a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-10 12:12+0000\n"
+"POT-Creation-Date: 2023-08-20 11:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-x509/messages.pot b/src/icingaweb2-module-x509/messages.pot
index b47ad16e..92bd4a0d 100644
--- a/src/icingaweb2-module-x509/messages.pot
+++ b/src/icingaweb2-module-x509/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 410afaa\n"
+"Project-Id-Version: Icinga L10n 04dd51a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-10 12:12+0000\n"
+"POT-Creation-Date: 2023-08-20 11:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2/messages.pot b/src/icingaweb2/messages.pot
index d75b4ef1..ce98eda7 100644
--- a/src/icingaweb2/messages.pot
+++ b/src/icingaweb2/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 410afaa\n"
+"Project-Id-Version: Icinga L10n 04dd51a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-10 12:12+0000\n"
+"POT-Creation-Date: 2023-08-20 11:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/ipl-validator/messages.pot b/src/ipl-validator/messages.pot
index de72b232..fe767499 100644
--- a/src/ipl-validator/messages.pot
+++ b/src/ipl-validator/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 410afaa\n"
+"Project-Id-Version: Icinga L10n 04dd51a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-10 12:12+0000\n"
+"POT-Creation-Date: 2023-08-20 11:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/ipl-web/messages.pot b/src/ipl-web/messages.pot
index 093989f2..449773cb 100644
--- a/src/ipl-web/messages.pot
+++ b/src/ipl-web/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 410afaa\n"
+"Project-Id-Version: Icinga L10n 04dd51a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-10 12:12+0000\n"
+"POT-Creation-Date: 2023-08-20 11:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -121,7 +121,7 @@ msgstr ""
 msgid "Apply"
 msgstr ""
 
-#: sources.d/ipl-web/src/Control/SortControl.php:280
+#: sources.d/ipl-web/src/Control/SortControl.php:281
 msgid "Change sort direction"
 msgstr ""