diff --git a/apbs_entities.install b/apbs_entities.install
index 19fc72ee001d77fc77a50c47a4708e75117c7364..94ae95e1b899efd92e1fcf17e79b14a15a0a894c 100644
--- a/apbs_entities.install
+++ b/apbs_entities.install
@@ -18,30 +18,37 @@ function apbs_entities_install(): void {
     'internal:/breeds' => [
       'en' => 'Breeds & Prices',
       'de' => t('Breeds & Prices', [], ['langcode' => 'de']),
+      'weight' => -6,
     ],
     'internal:/admin/content/booking/add' => [
       'en' => 'New booking',
       'de' => t('New booking', [], ['langcode' => 'de']),
+      'weight' => -10,
     ],
     'internal:/allocations-today' => [
       'en' => "Today's allocations",
       'de' => t("Today's allocations", [], ['langcode' => 'de']),
+      'weight' => -8,
     ],
     'internal:/arrivals-departures' => [
       'en' => 'Arrivals & Departures',
       'de' => t('Arrivals & Departures', [], ['langcode' => 'de']),
+      'weight' => -7,
     ],
     'internal:/admin/content/event/add/default' => [
       'en' => 'New Event',
       'de' => t('New Event', [], ['langcode' => 'de']),
+      'weight' => -9,
     ],
     'internal:' . str_replace('/en/', '/', Url::fromRoute('apbs_entities.redirects.mailpit')->toString()) => [
       'en' => 'Emails',
       'de' => t('Emails', [], ['langcode' => 'de']),
+      'weight' => -5,
     ],
     'internal:' . str_replace('/en/', '/', Url::fromRoute('apbs_entities.redirects.invoiceninja')->toString()) => [
       'en' => 'Invoices',
       'de' => t('Invoices', [], ['langcode' => 'de']),
+      'weight' => -4,
     ],
   ];
   foreach ($shortcuts as $uri => $labels) {
diff --git a/translations/apbs_entities.de.po b/translations/apbs_entities.de.po
index e2be222750f9fe3793da50c14589ff4499e1a7d9..8b59310de77cc06988e8f86e7f0c4555a3bf2acb 100644
--- a/translations/apbs_entities.de.po
+++ b/translations/apbs_entities.de.po
@@ -16,6 +16,8 @@
 #  modules/contrib/apbs_entities/src/Form/Settings.php: n/a
 #  modules/contrib/apbs_entities/config/install/taxonomy.vocabulary.vat.yml: n/a
 #  modules/contrib/apbs_entities/apbs_entities.module: n/a
+#  modules/contrib/apbs_entities/config/optional/views.view.animals.yml: n/a
+#  modules/contrib/apbs_entities/config/optional/views.view.customer_animals.yml: n/a
 #  modules/contrib/apbs_entities/apbs_entities.install: n/a
 #  modules/contrib/apbs_entities/config/optional/views.view.allocations_today.yml: n/a
 #  modules/contrib/apbs_entities/config/optional/views.view.contacts.yml: n/a
@@ -39,8 +41,6 @@
 #  modules/contrib/apbs_entities/src/Form/ArrivalDepartureBase.php: n/a
 #  modules/contrib/apbs_entities/config/optional/eca.eca.animals.yml: n/a
 #  modules/contrib/apbs_entities/config/optional/eca.model.animals.yml: n/a
-#  modules/contrib/apbs_entities/config/optional/views.view.animals.yml: n/a
-#  modules/contrib/apbs_entities/config/optional/views.view.customer_animals.yml: n/a
 #  modules/contrib/apbs_entities/src/Entity/BookingType.php: n/a
 #  modules/contrib/apbs_entities/config/optional/eca.eca.bookings.yml: n/a
 #  modules/contrib/apbs_entities/config/optional/eca.model.bookings.yml: n/a
@@ -132,6 +132,8 @@
 #  modules/contrib/apbs_entities/config/install/core.entity_view_mode.apbs_allocation.table.yml: n/a
 #  modules/contrib/apbs_entities/config/install/core.entity_view_mode.apbs_delivery.table.yml: n/a
 #  modules/contrib/apbs_entities/config/install/core.entity_view_mode.apbs_task.table.yml: n/a
+#  modules/contrib/apbs_entities/config/install/taxonomy.vocabulary.animal_flag.yml: n/a
+#  modules/contrib/apbs_entities/config/install/taxonomy.vocabulary.customer_flag.yml: n/a
 #  modules/contrib/apbs_entities/config/optional/eca.eca.breed_selection.yml: n/a
 #  modules/contrib/apbs_entities/config/optional/eca.model.breed_selection.yml: n/a
 #  modules/contrib/apbs_entities/config/optional/eca.eca.crons.yml: n/a
@@ -147,8 +149,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2024-09-03 17:01+0200\n"
-"PO-Revision-Date: 2024-09-03 17:01+0200\n"
+"POT-Creation-Date: 2024-09-05 14:27+0200\n"
+"PO-Revision-Date: 2024-09-05 14:27+0200\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: German <EMAIL@ADDRESS>\n"
 "MIME-Version: 1.0\n"
@@ -228,7 +230,7 @@ msgstr "Umsatzsteuer"
 msgid "Total price"
 msgstr "Gesamtpreis"
 
-#: modules/contrib/apbs_entities/apbs_entities.tokens.inc:174
+#: modules/contrib/apbs_entities/apbs_entities.tokens.inc:195
 msgid "Total"
 msgstr "Gesamt"
 
@@ -240,6 +242,10 @@ msgstr "Hilfe"
 msgid "Calendar"
 msgstr "Kalender"
 
+#: modules/contrib/apbs_entities/apbs_entities.module:265 modules/contrib/apbs_entities/config/optional/views.view.animals.yml:0 modules/contrib/apbs_entities/config/optional/views.view.customer_animals.yml:0
+msgid "Flags"
+msgstr "Kennzeichen"
+
 #: modules/contrib/apbs_entities/apbs_entities.install:20
 msgid "Breeds & Prices"
 msgstr "Rassen und Preise"
@@ -688,7 +694,7 @@ msgstr "Ankunft"
 msgid "Departure"
 msgstr "Abreise"
 
-#: modules/contrib/apbs_entities/apbs_entities.routing.yml:0 modules/contrib/apbs_entities/src/Form/Reallocate.php:109
+#: modules/contrib/apbs_entities/apbs_entities.routing.yml:0 modules/contrib/apbs_entities/src/Form/Reallocate.php:110
 msgid "Re-allocate"
 msgstr "Um-Belegung"
 
@@ -808,7 +814,7 @@ msgstr ""
 msgid "allocations types"
 msgstr ""
 
-#: modules/contrib/apbs_entities/src/Entity/Animal.php:91 modules/contrib/apbs_entities/src/Entity/Contact.php:94 modules/contrib/apbs_entities/config/optional/views.view.animals.yml:0 modules/contrib/apbs_entities/config/optional/views.view.customer_animals.yml:0
+#: modules/contrib/apbs_entities/src/Entity/Animal.php:91 modules/contrib/apbs_entities/src/Entity/Contact.php:110 modules/contrib/apbs_entities/config/optional/views.view.animals.yml:0 modules/contrib/apbs_entities/config/optional/views.view.customer_animals.yml:0
 msgid "Birthday"
 msgstr "Geburtstag"
 
@@ -957,7 +963,7 @@ msgstr "Gewichtung"
 msgid "Date range"
 msgstr "Zeitspanne"
 
-#: modules/contrib/apbs_entities/src/Entity/BaseFieldsTrait.php:1456 modules/contrib/apbs_entities/src/Form/Reallocate.php:99 modules/contrib/apbs_entities/config/install/taxonomy.vocabulary.room.yml:0 modules/contrib/apbs_entities/config/optional/eca.eca.rooms.yml:0 modules/contrib/apbs_entities/config/optional/eca.model.rooms.yml:0 modules/contrib/apbs_entities/config/optional/views.view.allocations.yml:0;0 modules/contrib/apbs_entities/config/optional/views.view.allocations_calendar.yml:0 modules/contrib/apbs_entities/config/optional/views.view.allocations_today.yml:0
+#: modules/contrib/apbs_entities/src/Entity/BaseFieldsTrait.php:1456 modules/contrib/apbs_entities/src/Form/Reallocate.php:100 modules/contrib/apbs_entities/config/install/taxonomy.vocabulary.room.yml:0 modules/contrib/apbs_entities/config/optional/eca.eca.rooms.yml:0 modules/contrib/apbs_entities/config/optional/eca.model.rooms.yml:0 modules/contrib/apbs_entities/config/optional/views.view.allocations.yml:0;0 modules/contrib/apbs_entities/config/optional/views.view.allocations_calendar.yml:0 modules/contrib/apbs_entities/config/optional/views.view.allocations_today.yml:0
 msgid "Room"
 msgstr "Raum"
 
@@ -1005,15 +1011,15 @@ msgstr ""
 msgid "bookings types"
 msgstr ""
 
-#: modules/contrib/apbs_entities/src/Entity/Contact.php:95
+#: modules/contrib/apbs_entities/src/Entity/Contact.php:111
 msgid "Birthplace"
 msgstr "Geburtsort"
 
-#: modules/contrib/apbs_entities/src/Entity/Contact.php:96
+#: modules/contrib/apbs_entities/src/Entity/Contact.php:112
 msgid "Passport Number"
 msgstr "Pass-Nummer"
 
-#: modules/contrib/apbs_entities/src/Entity/Contact.php:98
+#: modules/contrib/apbs_entities/src/Entity/Contact.php:114
 msgid "VAT valid until"
 msgstr "Umsatzsteuer ID gültig bis"
 
@@ -1049,11 +1055,15 @@ msgstr "Vertrag für @name, @date"
 msgid "Signed"
 msgstr ""
 
-#: modules/contrib/apbs_entities/src/Entity/Contract.php:106
+#: modules/contrib/apbs_entities/src/Entity/Contract.php:105
+msgid "Notify customer on completion"
+msgstr "Kunde bei Abschluss benachrichtigen"
+
+#: modules/contrib/apbs_entities/src/Entity/Contract.php:109
 msgid "Contract text"
 msgstr ""
 
-#: modules/contrib/apbs_entities/src/Entity/Contract.php:111
+#: modules/contrib/apbs_entities/src/Entity/Contract.php:114
 msgctxt "contract"
 msgid "Completed"
 msgstr "Fertiggestellt"
@@ -1542,7 +1552,7 @@ msgstr ""
 msgid "Relate each task which relates to the task."
 msgstr ""
 
-#: modules/contrib/apbs_entities/src/Form/ArrivalDepartureBase.php:56 modules/contrib/apbs_entities/src/Form/Reallocate.php:93
+#: modules/contrib/apbs_entities/src/Form/ArrivalDepartureBase.php:56 modules/contrib/apbs_entities/src/Form/Reallocate.php:94
 msgid "Date and time"
 msgstr "Datum und Uhrzeit"
 
@@ -1590,43 +1600,39 @@ msgstr "Benachrichtigung senden"
 msgid "Are you sure you want to cancel this event?"
 msgstr "Soll dieser Termin wirklich storniert werden?"
 
-#: modules/contrib/apbs_entities/src/Form/Reallocate.php:65
+#: modules/contrib/apbs_entities/src/Form/Reallocate.php:66
 msgid "Remove"
 msgstr "Entfernen"
 
-#: modules/contrib/apbs_entities/src/Form/Reallocate.php:66
+#: modules/contrib/apbs_entities/src/Form/Reallocate.php:67
 msgid "If checked, the allocation will be deleted and removed from the booking."
 msgstr ""
 "Wenn ausgewählt, wird die Belegung gelöscht und von der Buchung "
 "entfernt."
 
-#: modules/contrib/apbs_entities/src/Form/Reallocate.php:79
+#: modules/contrib/apbs_entities/src/Form/Reallocate.php:80
 msgid "Move completely"
 msgstr "Vollständig verschieben"
 
-#: modules/contrib/apbs_entities/src/Form/Reallocate.php:80
+#: modules/contrib/apbs_entities/src/Form/Reallocate.php:81
 msgid "If checked, the allocation will be moved completely. Otherwise, the allocation will be split at the given date and time."
 msgstr ""
 "Wenn ausgewählt, wird die vollständige Belegung verschoben. "
 "Andernfalls wird die Belegung bei der angegebenen Datum und Uhrzeit "
 "aufgeteilt."
 
-#: modules/contrib/apbs_entities/src/Form/Reallocate.php:129
+#: modules/contrib/apbs_entities/src/Form/Reallocate.php:130
 msgid "Date and time are outside the range of this allocation."
 msgstr "Datum und Uhrzeit sind außerhalb der Zeitspanne der Belegung."
 
-#: modules/contrib/apbs_entities/src/Form/Reallocate.php:151
+#: modules/contrib/apbs_entities/src/Form/Reallocate.php:152
 msgid "Allocation removed successfully."
 msgstr "Belegung erfolgreich entfernt."
 
-#: modules/contrib/apbs_entities/src/Form/Reallocate.php:160
+#: modules/contrib/apbs_entities/src/Form/Reallocate.php:161
 msgid "Allocation moved successfully."
 msgstr "Belegung wurde erfolgreich verschoben."
 
-#: modules/contrib/apbs_entities/src/Form/Reallocate.php:190
-msgid "Re-allocation completed successfully."
-msgstr "Um-Belegung erfolgreich durchgeführt."
-
 #: modules/contrib/apbs_entities/src/Form/Settings.php:82
 msgid "Default price"
 msgstr "Standard Preis"
@@ -1710,7 +1716,7 @@ msgstr "Öffnungszeiten"
 msgid "APBS Animal"
 msgstr ""
 
-#: modules/contrib/apbs_entities/src/Plugin/EntityReferenceSelection/Contact.php:8
+#: modules/contrib/apbs_entities/src/Plugin/EntityReferenceSelection/Contact.php:9
 msgid "APBS Contact"
 msgstr ""
 
@@ -1776,7 +1782,7 @@ msgctxt "Smart date format"
 msgid ", "
 msgstr ", "
 
-#: modules/contrib/apbs_entities/config/optional/views.view.allocations.yml:0;0;0;0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.allocations_calendar.yml:0;0;0;0;0;0;0;0;0;0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.allocations_today.yml:0;0;0;0;0;0;0;0;0;0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.animals.yml:0;0;0;0;0;0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.arrivals_departures.yml:0;0;0 modules/contrib/apbs_entities/config/optional/views.view.bookings.yml:0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.bookings_for_notifications.yml:0 modules/contrib/apbs_entities/config/optional/views.view.contacts.yml:0;0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.contracts.yml:0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.customer_animals.yml:0;0;0;0;0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.customer_bookings.yml:0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.deliveries.yml:0;0;0;0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.emails.yml:0;0;0 modules/contrib/apbs_entities/config/optional/views.view.events.yml:0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.events_calendar.yml:0;0;0;0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.staff.yml:0 modules/contrib/apbs_entities/config/optional/views.view.tasks.yml:0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.tasks_for_object.yml:0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.terms.yml:0;0;0;0;0
+#: modules/contrib/apbs_entities/config/optional/views.view.allocations.yml:0;0;0;0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.allocations_calendar.yml:0;0;0;0;0;0;0;0;0;0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.allocations_today.yml:0;0;0;0;0;0;0;0;0;0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.animals.yml:0;0;0;0;0;0;0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.arrivals_departures.yml:0;0;0 modules/contrib/apbs_entities/config/optional/views.view.bookings.yml:0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.bookings_for_notifications.yml:0 modules/contrib/apbs_entities/config/optional/views.view.contacts.yml:0;0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.contracts.yml:0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.customer_animals.yml:0;0;0;0;0;0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.customer_bookings.yml:0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.deliveries.yml:0;0;0;0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.emails.yml:0;0;0 modules/contrib/apbs_entities/config/optional/views.view.events.yml:0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.events_calendar.yml:0;0;0;0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.staff.yml:0 modules/contrib/apbs_entities/config/optional/views.view.tasks.yml:0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.tasks_for_object.yml:0;0;0;0 modules/contrib/apbs_entities/config/optional/views.view.terms.yml:0;0;0;0;0
 msgid ", "
 msgstr ", "
 
@@ -1797,6 +1803,14 @@ msgctxt "Smart date format"
 msgid "Y-m-d"
 msgstr ""
 
+#: modules/contrib/apbs_entities/config/install/taxonomy.vocabulary.animal_flag.yml:0
+msgid "Animal Flag"
+msgstr "Tier Kennzeichen"
+
+#: modules/contrib/apbs_entities/config/install/taxonomy.vocabulary.customer_flag.yml:0
+msgid "Customer Flag"
+msgstr "Kunde Kennzeichen"
+
 #: modules/contrib/apbs_entities/config/optional/eca.eca.breed_selection.yml:0 modules/contrib/apbs_entities/config/optional/eca.model.breed_selection.yml:0
 msgid "Breed selection"
 msgstr ""