diff --git a/Classes/Controller/JoblistController.php b/Classes/Controller/JoblistController.php
index 483c525bd5129a8147d4470c0ee00737fcd8279f..a0066ae81ec449d2d7ce0e37b373c9784c816dea 100644
--- a/Classes/Controller/JoblistController.php
+++ b/Classes/Controller/JoblistController.php
@@ -71,8 +71,6 @@ use TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException;
 use TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException;
 use TYPO3\CMS\Extbase\Property\Exception\TypeConverterException;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
-use TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator;
-use TYPO3\CMS\Extbase\Validation\Validator\GenericObjectValidator;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use TYPO3\CMS\Frontend\Controller\ErrorController;
 use TYPO3\CMS\Frontend\Page\PageAccessFailureReasons;
@@ -260,6 +258,17 @@ class JoblistController extends ActionController {
 			)['persistence']['storagePid']
 		);
 
+		if ($currentPageBrowserPage > 0 && ExtensionManagementUtility::isLoaded('sg_seo')) {
+			$headTagService = GeneralUtility::makeInstance(
+				HeadTagService::class,
+				FALSE,
+				'',
+				'',
+				'&tx_sgjobs_pagebrowser[currentPage]=' . $currentPageBrowserPage
+			);
+			$headTagService->execute();
+		}
+
 		$this->assignFilterValues($storagePids, $filters);
 		$this->view->assign('recordPageIds', $storagePids);
 		$jobLimit = (int) $this->settings['jobLimit'];
diff --git a/Classes/Domain/Model/Job.php b/Classes/Domain/Model/Job.php
index a9fbba2ab1f99c86a0f413fb63a54370ae983ebb..79165bfb085248c1d78b0faf15b1ffbb717caf88 100644
--- a/Classes/Domain/Model/Job.php
+++ b/Classes/Domain/Model/Job.php
@@ -107,7 +107,7 @@ class Job extends AbstractEntity {
 	 * @var ObjectStorage<Company>
 	 */
 	#[Lazy]
-	protected $company = NULL;
+	protected $company;
 
 	/**
 	 * @var ObjectStorage<Job>
diff --git a/Classes/Domain/Model/JobApplication.php b/Classes/Domain/Model/JobApplication.php
index a19e4a26c2f8c0408ebcaeac275145c3601b87ec..c5a7d640bcb38cb0d7097c8afb01c0cb23948190 100644
--- a/Classes/Domain/Model/JobApplication.php
+++ b/Classes/Domain/Model/JobApplication.php
@@ -53,7 +53,7 @@ class JobApplication extends AbstractEntity {
 	 * @var ObjectStorage<Company>
 	 */
 	#[Lazy]
-	protected $company = NULL;
+	protected $company;
 
 	/**
 	 * @var Job $job
diff --git a/Resources/Private/Language/de.locallang.xlf b/Resources/Private/Language/de.locallang.xlf
index c1939c874f2162e4aee618727d7949d26fa34cdc..025bdd1781fcedf8be52eba7abdd297f7b3359a5 100644
--- a/Resources/Private/Language/de.locallang.xlf
+++ b/Resources/Private/Language/de.locallang.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2023-09-06T17:30:53Z">
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+	<file source-language="en" target-language="de" datatype="plaintext" original="EXT:sg_jobs/Resources/Private/Language/locallang.xlf" date="2024-01-18T20:23:37Z">
 		<header>
 			<type>module</type>
 			<description>General language labels used in frontend and backend.</description>
@@ -9,511 +9,511 @@
 			<authorEmail>fabian@sgalinski.de</authorEmail>
 		</header>
 		<body>
-			<trans-unit id="application_mail.marker.birthdate" approved="yes">
+			<trans-unit id="application_mail.marker.birthdate" resname="application_mail.marker.birthdate" approved="yes">
 				<source><![CDATA[Date of birth]]></source>
 				<target><![CDATA[Geburtsdatum]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.city" approved="yes">
+			<trans-unit id="application_mail.marker.city" resname="application_mail.marker.city" approved="yes">
 				<source><![CDATA[City]]></source>
 				<target><![CDATA[Ort]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.country" approved="yes">
+			<trans-unit id="application_mail.marker.country" resname="application_mail.marker.country" approved="yes">
 				<source><![CDATA[Country]]></source>
 				<target><![CDATA[Land]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.education" approved="yes">
+			<trans-unit id="application_mail.marker.education" resname="application_mail.marker.education" approved="yes">
 				<source><![CDATA[Education]]></source>
 				<target><![CDATA[Höchster Bildungsabschluss]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.email" approved="yes">
+			<trans-unit id="application_mail.marker.email" resname="application_mail.marker.email" approved="yes">
 				<source><![CDATA[Email]]></source>
 				<target><![CDATA[E-Mail]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.firstname" approved="yes">
+			<trans-unit id="application_mail.marker.firstname" resname="application_mail.marker.firstname" approved="yes">
 				<source><![CDATA[First name]]></source>
 				<target><![CDATA[Vorname]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.gender" approved="yes">
+			<trans-unit id="application_mail.marker.freetextField1" resname="application_mail.marker.freetextField1" approved="yes">
+				<source><![CDATA[Free text field 1]]></source>
+				<target><![CDATA[Freitextfeld 1]]></target>
+			</trans-unit>
+			<trans-unit id="application_mail.marker.freetextField2" resname="application_mail.marker.freetextField2" approved="yes">
+				<source><![CDATA[Free text field 2]]></source>
+				<target><![CDATA[Freitextfeld 2]]></target>
+			</trans-unit>
+			<trans-unit id="application_mail.marker.freetextField3" resname="application_mail.marker.freetextField3" approved="yes">
+				<source><![CDATA[Free text field 3]]></source>
+				<target><![CDATA[Freitextfeld 3]]></target>
+			</trans-unit>
+			<trans-unit id="application_mail.marker.freetextField4" resname="application_mail.marker.freetextField4" approved="yes">
+				<source><![CDATA[Free text field 4]]></source>
+				<target><![CDATA[Freitextfeld 4]]></target>
+			</trans-unit>
+			<trans-unit id="application_mail.marker.freetextField5" resname="application_mail.marker.freetextField5" approved="yes">
+				<source><![CDATA[Free text field 5]]></source>
+				<target><![CDATA[Freitextfeld 5]]></target>
+			</trans-unit>
+			<trans-unit id="application_mail.marker.gender" resname="application_mail.marker.gender" approved="yes">
 				<source><![CDATA[Gender]]></source>
 				<target><![CDATA[Geschlecht]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.jobtitle" approved="yes">
+			<trans-unit id="application_mail.marker.jobtitle" resname="application_mail.marker.jobtitle" approved="yes">
 				<source><![CDATA[Job title]]></source>
 				<target><![CDATA[Job-Titel]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.lastname" approved="yes">
+			<trans-unit id="application_mail.marker.lastname" resname="application_mail.marker.lastname" approved="yes">
 				<source><![CDATA[Last name]]></source>
 				<target><![CDATA[Nachname]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.location" approved="yes">
+			<trans-unit id="application_mail.marker.location" resname="application_mail.marker.location" approved="yes">
 				<source><![CDATA[The location regarding the unsolicited application]]></source>
 				<target><![CDATA[Der Standort für die Initiativbewerbung]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.message" approved="yes">
+			<trans-unit id="application_mail.marker.message" resname="application_mail.marker.message" approved="yes">
 				<source><![CDATA[Message]]></source>
 				<target><![CDATA[Bemerkungen]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.mobile" approved="yes">
+			<trans-unit id="application_mail.marker.mobile" resname="application_mail.marker.mobile" approved="yes">
 				<source><![CDATA[Mobile]]></source>
 				<target><![CDATA[Mobil]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.nationality" approved="yes">
+			<trans-unit id="application_mail.marker.nationality" resname="application_mail.marker.nationality" approved="yes">
 				<source><![CDATA[Nationality]]></source>
 				<target><![CDATA[Nationalität]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.phone" approved="yes">
+			<trans-unit id="application_mail.marker.phone" resname="application_mail.marker.phone" approved="yes">
 				<source><![CDATA[Phone]]></source>
 				<target><![CDATA[Telefon]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.salutation" approved="yes">
+			<trans-unit id="application_mail.marker.salutation" resname="application_mail.marker.salutation" approved="yes">
 				<source><![CDATA[Salutation]]></source>
 				<target><![CDATA[Anrede]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.street" approved="yes">
+			<trans-unit id="application_mail.marker.street" resname="application_mail.marker.street" approved="yes">
 				<source><![CDATA[Street]]></source>
 				<target><![CDATA[Straße]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.zip" approved="yes">
+			<trans-unit id="application_mail.marker.zip" resname="application_mail.marker.zip" approved="yes">
 				<source><![CDATA[Zip]]></source>
 				<target><![CDATA[Plz]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.freetextField1" approved="yes">
-				<source><![CDATA[Free text field 1]]></source>
-				<target><![CDATA[Freitextfeld 1]]></target>
-			</trans-unit>
-			<trans-unit id="application_mail.marker.freetextField2" approved="yes">
-				<source><![CDATA[Free text field 2]]></source>
-				<target><![CDATA[Freitextfeld 2]]></target>
-			</trans-unit>
-			<trans-unit id="application_mail.marker.freetextField3" approved="yes">
-				<source><![CDATA[Free text field 3]]></source>
-				<target><![CDATA[Freitextfeld 3]]></target>
-			</trans-unit>
-			<trans-unit id="application_mail.marker.freetextField4" approved="yes">
-				<source><![CDATA[Free text field 4]]></source>
-				<target><![CDATA[Freitextfeld 4]]></target>
-			</trans-unit>
-			<trans-unit id="application_mail.marker.freetextField5" approved="yes">
-				<source><![CDATA[Free text field 5]]></source>
-				<target><![CDATA[Freitextfeld 5]]></target>
-			</trans-unit>
-			<trans-unit id="backend.button_create" approved="yes">
+			<trans-unit id="backend.button_create" resname="backend.button_create" approved="yes">
 				<source><![CDATA[New]]></source>
 				<target><![CDATA[Neu]]></target>
 			</trans-unit>
-			<trans-unit id="backend.button_create_job" approved="yes">
+			<trans-unit id="backend.button_create_job" resname="backend.button_create_job" approved="yes">
 				<source><![CDATA[New job offer]]></source>
 				<target><![CDATA[Neue Stellenanzeige]]></target>
 			</trans-unit>
-			<trans-unit id="backend.button_create_location" approved="yes">
+			<trans-unit id="backend.button_create_location" resname="backend.button_create_location" approved="yes">
 				<source><![CDATA[New location]]></source>
 				<target><![CDATA[Neuer Arbeitsort]]></target>
 			</trans-unit>
-			<trans-unit id="backend.filter" approved="yes">
+			<trans-unit id="backend.filter" resname="backend.filter" approved="yes">
 				<source><![CDATA[Filter]]></source>
 				<target><![CDATA[Filter anwenden]]></target>
 			</trans-unit>
-			<trans-unit id="backend.filters.editLocation" approved="yes">
+			<trans-unit id="backend.filters.editLocation" resname="backend.filters.editLocation" approved="yes">
 				<source><![CDATA[Edit selected location]]></source>
 				<target><![CDATA[Den ausgewählten Arbeitsort bearbeiten]]></target>
 			</trans-unit>
-			<trans-unit id="backend.filters.locations" approved="yes">
+			<trans-unit id="backend.filters.locations" resname="backend.filters.locations" approved="yes">
 				<source><![CDATA[Locations]]></source>
 				<target><![CDATA[Arbeitsorte]]></target>
 			</trans-unit>
-			<trans-unit id="backend.filters.locations.description" approved="yes" xml:space="preserve">
+			<trans-unit id="backend.filters.locations.description" resname="backend.filters.locations.description" approved="yes" xml:space="preserve">
 				<source><![CDATA[(Use the ctrl or cmd keys to deselect an option or to select multiple options) ]]></source>
 				<target><![CDATA[Benutze die STRG oder CMD-Tasten, um eine Option abzuwählen oder mehrere anzuwählen
 ]]></target>
 			</trans-unit>
-			<trans-unit id="backend.filters.search" approved="yes">
+			<trans-unit id="backend.filters.search" resname="backend.filters.search" approved="yes">
 				<source><![CDATA[Search]]></source>
 				<target><![CDATA[Suchen]]></target>
 			</trans-unit>
-			<trans-unit id="backend.jobs.header" approved="yes">
+			<trans-unit id="backend.jobs.header" resname="backend.jobs.header" approved="yes">
 				<source><![CDATA[Job offers]]></source>
 				<target><![CDATA[Stellenangebote]]></target>
 			</trans-unit>
-			<trans-unit id="backend.list.header" approved="yes">
+			<trans-unit id="backend.list.header" resname="backend.list.header" approved="yes">
 				<source><![CDATA[Header]]></source>
 				<target><![CDATA[Kopf]]></target>
 			</trans-unit>
-			<trans-unit id="backend.list.item" approved="yes">
+			<trans-unit id="backend.list.item" resname="backend.list.item" approved="yes">
 				<source><![CDATA[Item]]></source>
 				<target><![CDATA[Eintrag]]></target>
 			</trans-unit>
-			<trans-unit id="backend.message.error" approved="yes">
+			<trans-unit id="backend.message.error" resname="backend.message.error" approved="yes">
 				<source><![CDATA[Something went wrong. Please reload.]]></source>
 				<target><![CDATA[Etwas ist schiefgelaufen. Bitte laden Sie die Seite neu.]]></target>
 			</trans-unit>
-			<trans-unit id="backend.noJobsMessage" approved="yes">
+			<trans-unit id="backend.noJobsMessage" resname="backend.noJobsMessage" approved="yes">
 				<source><![CDATA[There are no jobs that match your criteria]]></source>
 				<target><![CDATA[Es gibt keine Stellenangebote für Ihre Suchkriterien]]></target>
 			</trans-unit>
-			<trans-unit id="backend.notice.noRecords" approved="yes">
+			<trans-unit id="backend.notice.noRecords" resname="backend.notice.noRecords" approved="yes">
 				<source><![CDATA[There are no records on this page]]></source>
 				<target><![CDATA[Es gibt keine Datensätze auf dieser Seite]]></target>
 			</trans-unit>
-			<trans-unit id="backend.reset_filter" approved="yes">
+			<trans-unit id="backend.reset_filter" resname="backend.reset_filter" approved="yes">
 				<source><![CDATA[Reset filter]]></source>
 				<target><![CDATA[Filter zurücksetzen]]></target>
 			</trans-unit>
-			<trans-unit id="backend.selectRootPage" approved="yes">
+			<trans-unit id="backend.selectRootPage" resname="backend.selectRootPage" approved="yes">
 				<source><![CDATA[Please select one of the following pages:]]></source>
 				<target><![CDATA[Bitte wählen Sie eine der folgenden Seiten aus:]]></target>
 			</trans-unit>
-			<trans-unit id="configuration.jobFolderPath" approved="yes">
-				<source><![CDATA[Job Folder Path (Relative to fileadmin, defaults to "JobApplication")]]></source>
-				<target><![CDATA[Job-Verzeichnis-Pfad (relativ zu fileadmin, Standardwert ist "JobApplication")]]></target>
-			</trans-unit>
-			<trans-unit id="configuration.applicantMail" approved="yes">
+			<trans-unit id="configuration.applicantMail" resname="configuration.applicantMail" approved="yes">
 				<source><![CDATA[Send confirmation e-mail to applicants (sg_mail template "applicant_mail")]]></source>
 				<target><![CDATA[Bestätigungs-E-Mail an Bewerber versenden (sg_mail Template "applicant_mail")]]></target>
 			</trans-unit>
-			<trans-unit id="error.NoSuchArgumentException" approved="yes">
+			<trans-unit id="configuration.jobFolderPath" resname="configuration.jobFolderPath" approved="yes">
+				<source><![CDATA[Job Folder Path (Relative to fileadmin, defaults to "JobApplication")]]></source>
+				<target><![CDATA[Job-Verzeichnis-Pfad (relativ zu fileadmin, Standardwert ist "JobApplication")]]></target>
+			</trans-unit>
+			<trans-unit id="error.NoSuchArgumentException" resname="error.NoSuchArgumentException" approved="yes">
 				<source><![CDATA[Some file could not be uploaded. Is it too large?]]></source>
 				<target><![CDATA[Einige Dateien konnten nicht hochgeladen werden. Ist eine Datei zu groß?]]></target>
 			</trans-unit>
-			<trans-unit id="error.TypeConverterException.missing." approved="yes">
+			<trans-unit id="error.TypeConverterException.missing." resname="error.TypeConverterException.missing." approved="yes">
 				<source><![CDATA[Missing some file]]></source>
 				<target><![CDATA[Eine Datei fehlt]]></target>
 			</trans-unit>
-			<trans-unit id="error.TypeConverterException.missing.certificate" approved="yes">
+			<trans-unit id="error.TypeConverterException.missing.certificate" resname="error.TypeConverterException.missing.certificate" approved="yes">
 				<source><![CDATA[Missing certificate file]]></source>
 				<target><![CDATA[Datei für Zeugnis fehlt]]></target>
 			</trans-unit>
-			<trans-unit id="error.TypeConverterException.missing.coverLetter" approved="yes">
+			<trans-unit id="error.TypeConverterException.missing.coverLetter" resname="error.TypeConverterException.missing.coverLetter" approved="yes">
 				<source><![CDATA[Missing coverletter file]]></source>
 				<target><![CDATA[Datei für Motivationsschreiben fehlt]]></target>
 			</trans-unit>
-			<trans-unit id="error.TypeConverterException.missing.cv" approved="yes">
+			<trans-unit id="error.TypeConverterException.missing.cv" resname="error.TypeConverterException.missing.cv" approved="yes">
 				<source><![CDATA[Missing cv file]]></source>
 				<target><![CDATA[Datei für Lebenslauf fehlt]]></target>
 			</trans-unit>
-			<trans-unit id="error.TypeConverterException.type" approved="yes">
+			<trans-unit id="error.TypeConverterException.type" resname="error.TypeConverterException.type" approved="yes">
 				<source><![CDATA[File extension is not allowed!]]></source>
 				<target><![CDATA[Dateityp nicht erlaubt!]]></target>
 			</trans-unit>
-			<trans-unit id="error.maxFileSizeMessage" approved="yes">
+			<trans-unit id="error.maxFileSizeMessage" resname="error.maxFileSizeMessage" approved="yes">
 				<source><![CDATA[The selected file exceeds the maximum file size]]></source>
 				<target><![CDATA[Die ausgewählte Datei ist zu groß!]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.allVacancies" approved="yes">
+			<trans-unit id="frontend.allVacancies" resname="frontend.allVacancies" approved="yes">
 				<source><![CDATA[All vacancies]]></source>
 				<target><![CDATA[Alle offenen Stellen]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.allowed_file_extensions" approved="yes">
+			<trans-unit id="frontend.apply.allowed_file_extensions" resname="frontend.apply.allowed_file_extensions" approved="yes">
 				<source><![CDATA[File types: ]]></source>
 				<target><![CDATA[Datentypen: ]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.applyAs" approved="yes">
+			<trans-unit id="frontend.apply.applyAs" resname="frontend.apply.applyAs" approved="yes">
 				<source><![CDATA[Apply as]]></source>
 				<target><![CDATA[Bewerbung als]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.applyAsNow" approved="yes">
+			<trans-unit id="frontend.apply.applyAsNow" resname="frontend.apply.applyAsNow" approved="yes">
 				<source><![CDATA[Apply now as %s]]></source>
 				<target><![CDATA[Jetzt als %s bewerben]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.birthDate" approved="yes">
+			<trans-unit id="frontend.apply.birthDate" resname="frontend.apply.birthDate" approved="yes">
 				<source><![CDATA[Birth date *]]></source>
 				<target><![CDATA[Geburtsdatum *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.certificate" approved="yes">
+			<trans-unit id="frontend.apply.certificate" resname="frontend.apply.certificate" approved="yes">
 				<source><![CDATA[Certificate *]]></source>
 				<target><![CDATA[Zeugnis *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.city" approved="yes">
+			<trans-unit id="frontend.apply.city" resname="frontend.apply.city" approved="yes">
 				<source><![CDATA[City *]]></source>
 				<target><![CDATA[Ort *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.company" approved="yes">
+			<trans-unit id="frontend.apply.company" resname="frontend.apply.company" approved="yes">
 				<source><![CDATA[Location *]]></source>
 				<target><![CDATA[Standort *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.contact" approved="yes">
+			<trans-unit id="frontend.apply.contact" resname="frontend.apply.contact" approved="yes">
 				<source><![CDATA[Your contact]]></source>
 				<target><![CDATA[Dein Kontakt]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.country" approved="yes">
+			<trans-unit id="frontend.apply.country" resname="frontend.apply.country" approved="yes">
 				<source><![CDATA[Country *]]></source>
 				<target><![CDATA[Land *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.country.empty" approved="yes">
+			<trans-unit id="frontend.apply.country.empty" resname="frontend.apply.country.empty" approved="yes">
 				<source><![CDATA[Please choose]]></source>
 				<target><![CDATA[Bitte wählen]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.cover_letter" approved="yes">
+			<trans-unit id="frontend.apply.cover_letter" resname="frontend.apply.cover_letter" approved="yes">
 				<source><![CDATA[Cover letter *]]></source>
 				<target><![CDATA[Motivationsschreiben *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.cv" approved="yes">
+			<trans-unit id="frontend.apply.cv" resname="frontend.apply.cv" approved="yes">
 				<source><![CDATA[CV *]]></source>
 				<target><![CDATA[Lebenslauf *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.education" approved="yes">
+			<trans-unit id="frontend.apply.education" resname="frontend.apply.education" approved="yes">
 				<source><![CDATA[Highest achieved education *]]></source>
 				<target><![CDATA[Höchster Abschluss *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.email" approved="yes">
+			<trans-unit id="frontend.apply.email" resname="frontend.apply.email" approved="yes">
 				<source><![CDATA[Email *]]></source>
 				<target><![CDATA[E-Mail *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.error.general" approved="yes">
+			<trans-unit id="frontend.apply.error.general" resname="frontend.apply.error.general" approved="yes">
 				<source><![CDATA[An error has occured]]></source>
 				<target><![CDATA[Ein Fehler ist aufgetreten]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.first_name" approved="yes">
+			<trans-unit id="frontend.apply.first_name" resname="frontend.apply.first_name" approved="yes">
 				<source><![CDATA[First name *]]></source>
 				<target><![CDATA[Vorname *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.gender" approved="yes">
+			<trans-unit id="frontend.apply.gender" resname="frontend.apply.gender" approved="yes">
 				<source><![CDATA[Gender]]></source>
 				<target><![CDATA[Geschlecht]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.gender.female" approved="yes">
+			<trans-unit id="frontend.apply.gender.female" resname="frontend.apply.gender.female" approved="yes">
 				<source><![CDATA[Female]]></source>
 				<target><![CDATA[Weiblich]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.gender.male" approved="yes">
+			<trans-unit id="frontend.apply.gender.male" resname="frontend.apply.gender.male" approved="yes">
 				<source><![CDATA[Male]]></source>
 				<target><![CDATA[Männlich]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.gender.other" approved="yes">
+			<trans-unit id="frontend.apply.gender.other" resname="frontend.apply.gender.other" approved="yes">
 				<source><![CDATA[Other]]></source>
 				<target><![CDATA[Divers]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.last_name" approved="yes">
+			<trans-unit id="frontend.apply.last_name" resname="frontend.apply.last_name" approved="yes">
 				<source><![CDATA[Last name *]]></source>
 				<target><![CDATA[Nachname *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.location" approved="yes">
+			<trans-unit id="frontend.apply.location" resname="frontend.apply.location" approved="yes">
 				<source><![CDATA[Location *]]></source>
 				<target><![CDATA[Standort *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.maxFileSize" approved="yes">
+			<trans-unit id="frontend.apply.maxFileSize" resname="frontend.apply.maxFileSize" approved="yes">
 				<source><![CDATA[Maximum file size:]]></source>
 				<target><![CDATA[Maximale Dateigröße:]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.message" approved="yes">
+			<trans-unit id="frontend.apply.message" resname="frontend.apply.message" approved="yes">
 				<source><![CDATA[Message]]></source>
 				<target><![CDATA[Ihre Nachricht]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.mobile" approved="yes">
+			<trans-unit id="frontend.apply.mobile" resname="frontend.apply.mobile" approved="yes">
 				<source><![CDATA[Mobile]]></source>
 				<target><![CDATA[Mobil]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.nationality" approved="yes">
+			<trans-unit id="frontend.apply.nationality" resname="frontend.apply.nationality" approved="yes">
 				<source><![CDATA[Nationality *]]></source>
 				<target><![CDATA[Nationalität *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.nationality.empty" approved="yes">
+			<trans-unit id="frontend.apply.nationality.empty" resname="frontend.apply.nationality.empty" approved="yes">
 				<source><![CDATA[Please choose]]></source>
 				<target><![CDATA[Bitte wählen]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.phone" approved="yes">
+			<trans-unit id="frontend.apply.phone" resname="frontend.apply.phone" approved="yes">
 				<source><![CDATA[Phone *]]></source>
 				<target><![CDATA[Telefon *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.privacyPolicy" approved="yes">
+			<trans-unit id="frontend.apply.privacyPolicy" resname="frontend.apply.privacyPolicy" approved="yes">
 				<source><![CDATA[I have read the %s and confirm the usage of my personal data according to it. *]]></source>
 				<target><![CDATA[Ich habe die %s zur Kenntnis genommen und bin mit der dort beschriebenen Verwendung meiner Daten einverstanden. *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.privacyPolicy.link" approved="yes">
+			<trans-unit id="frontend.apply.privacyPolicy.link" resname="frontend.apply.privacyPolicy.link" approved="yes">
 				<source><![CDATA[privacy policy]]></source>
 				<target><![CDATA[Datenschutzinformationen]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.recommend" approved="yes">
+			<trans-unit id="frontend.apply.recommend" resname="frontend.apply.recommend" approved="yes">
 				<source><![CDATA[Recommend job]]></source>
 				<target><![CDATA[Stelle weiterempfehlen]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.relatedJobs" approved="yes">
+			<trans-unit id="frontend.apply.relatedJobs" resname="frontend.apply.relatedJobs" approved="yes">
 				<source><![CDATA[Related Jobs]]></source>
 				<target><![CDATA[Verwandte Stellenanzeigen]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.salutation" approved="yes">
+			<trans-unit id="frontend.apply.salutation" resname="frontend.apply.salutation" approved="yes">
 				<source><![CDATA[Salutation]]></source>
 				<target><![CDATA[Anrede]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.street" approved="yes">
+			<trans-unit id="frontend.apply.street" resname="frontend.apply.street" approved="yes">
 				<source><![CDATA[Street *]]></source>
 				<target><![CDATA[Straße *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.thank_you" approved="yes">
+			<trans-unit id="frontend.apply.thank_you" resname="frontend.apply.thank_you" approved="yes">
 				<source><![CDATA[Thank you for your application!]]></source>
 				<target><![CDATA[Vielen Dank für Ihre Bewerbung!]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.title" approved="yes">
+			<trans-unit id="frontend.apply.title" resname="frontend.apply.title" approved="yes">
 				<source><![CDATA[Job title *]]></source>
 				<target><![CDATA[Job-Titel *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.unsolicitedApplication" approved="yes">
+			<trans-unit id="frontend.apply.unsolicitedApplication" resname="frontend.apply.unsolicitedApplication" approved="yes">
 				<source><![CDATA[Unsolicited Application]]></source>
 				<target><![CDATA[Initiativbewerbung]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.zip" approved="yes">
+			<trans-unit id="frontend.apply.zip" resname="frontend.apply.zip" approved="yes">
 				<source><![CDATA[Zip *]]></source>
 				<target><![CDATA[PLZ *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.applyNow" approved="yes">
+			<trans-unit id="frontend.applyNow" resname="frontend.applyNow" approved="yes">
 				<source><![CDATA[Apply online now]]></source>
 				<target><![CDATA[Jetzt online bewerben]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.applyNow.emptyApplication" approved="yes">
+			<trans-unit id="frontend.applyNow.emptyApplication" resname="frontend.applyNow.emptyApplication" approved="yes">
 				<source><![CDATA[Apply to an unlisted position]]></source>
 				<target><![CDATA[Initiativ-Bewerbung]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply_by_mail" approved="yes">
+			<trans-unit id="frontend.apply_by_mail" resname="frontend.apply_by_mail" approved="yes">
 				<source><![CDATA[Apply by mail]]></source>
 				<target><![CDATA[Bewerbung per Post]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.attachment" approved="yes">
+			<trans-unit id="frontend.attachment" resname="frontend.attachment" approved="yes">
 				<source><![CDATA[Download job advertisement]]></source>
 				<target><![CDATA[Stellenanzeige herunterladen]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.department" approved="yes">
+			<trans-unit id="frontend.department" resname="frontend.department" approved="yes">
 				<source><![CDATA[Department]]></source>
 				<target><![CDATA[Bereich]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.description" approved="yes">
+			<trans-unit id="frontend.description" resname="frontend.description" approved="yes">
 				<source><![CDATA[Description]]></source>
 				<target><![CDATA[Beschreibung]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.detail.back" approved="yes">
+			<trans-unit id="frontend.detail.back" resname="frontend.detail.back" approved="yes">
 				<source><![CDATA[Back]]></source>
 				<target><![CDATA[Zurück]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.detail.header" approved="yes">
+			<trans-unit id="frontend.detail.header" resname="frontend.detail.header" approved="yes">
 				<source><![CDATA[Header]]></source>
 				<target><![CDATA[Kopf]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.email" approved="yes">
+			<trans-unit id="frontend.email" resname="frontend.email" approved="yes">
 				<source><![CDATA[Apply by email]]></source>
 				<target><![CDATA[Bewerbung per Mail]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.emailContact" approved="yes">
+			<trans-unit id="frontend.emailContact" resname="frontend.emailContact" approved="yes">
 				<source><![CDATA[Email Contact]]></source>
 				<target><![CDATA[E-Mail-Kontakt]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.entry_date" approved="yes">
+			<trans-unit id="frontend.entry_date" resname="frontend.entry_date" approved="yes">
 				<source><![CDATA[Entry date]]></source>
 				<target><![CDATA[Eintrittsdatum]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.experienceLevel" approved="yes">
+			<trans-unit id="frontend.experienceLevel" resname="frontend.experienceLevel" approved="yes">
 				<source><![CDATA[Experience Level]]></source>
 				<target><![CDATA[Erfahrung]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.filter.companies" approved="yes">
+			<trans-unit id="frontend.filter.companies" resname="frontend.filter.companies" approved="yes">
 				<source><![CDATA[Company]]></source>
 				<target><![CDATA[Unternehmen]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.filter.countries" approved="yes">
+			<trans-unit id="frontend.filter.countries" resname="frontend.filter.countries" approved="yes">
 				<source><![CDATA[Country]]></source>
 				<target><![CDATA[Land]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.filter.countriesfunctions" approved="yes">
+			<trans-unit id="frontend.filter.countriesfunctions" resname="frontend.filter.countriesfunctions" approved="yes">
 				<source><![CDATA[Function]]></source>
 				<target><![CDATA[Funktion]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.filter.departments" approved="yes">
+			<trans-unit id="frontend.filter.departments" resname="frontend.filter.departments" approved="yes">
 				<source><![CDATA[Departments]]></source>
 				<target><![CDATA[Bereich]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.filter.experienceLevels" approved="yes">
+			<trans-unit id="frontend.filter.experienceLevels" resname="frontend.filter.experienceLevels" approved="yes">
 				<source><![CDATA[Experience Level]]></source>
 				<target><![CDATA[Erfahrungslevel]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.filter.functions" approved="yes">
+			<trans-unit id="frontend.filter.functions" resname="frontend.filter.functions" approved="yes">
 				<source><![CDATA[Function]]></source>
 				<target><![CDATA[Funktion]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.filter.locations" approved="yes">
+			<trans-unit id="frontend.filter.locations" resname="frontend.filter.locations" approved="yes">
 				<source><![CDATA[Location]]></source>
 				<target><![CDATA[Standort]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.filter.remote" approved="yes">
+			<trans-unit id="frontend.filter.remote" resname="frontend.filter.remote" approved="yes">
 				<source><![CDATA[Show fully remote jobs only]]></source>
 				<target><![CDATA[Zeige nur Stellen komplett im Homeoffice]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.filter.selections.all" approved="yes">
+			<trans-unit id="frontend.filter.selections.all" resname="frontend.filter.selections.all" approved="yes">
 				<source><![CDATA[All]]></source>
 				<target><![CDATA[Alle]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.filter.submit" approved="yes">
+			<trans-unit id="frontend.filter.submit" resname="frontend.filter.submit" approved="yes">
 				<source><![CDATA[Filter]]></source>
 				<target><![CDATA[Filtern]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.function" approved="yes">
+			<trans-unit id="frontend.function" resname="frontend.function" approved="yes">
 				<source><![CDATA[Function]]></source>
 				<target><![CDATA[Funktion]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.job.suggestForm" approved="yes">
+			<trans-unit id="frontend.job.suggestForm" resname="frontend.job.suggestForm" approved="yes">
 				<source><![CDATA[<b>Or use the online form</b>]]></source>
 				<target><![CDATA[<b>Oder nutze das Online-Formular</b>]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.job.via.email" approved="yes">
+			<trans-unit id="frontend.job.via.email" resname="frontend.job.via.email" approved="yes">
 				<source><![CDATA[<b>By email:</b>]]></source>
 				<target><![CDATA[<b>Per E-Mail:</b>]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.job.via.post" approved="yes">
+			<trans-unit id="frontend.job.via.post" resname="frontend.job.via.post" approved="yes">
 				<source><![CDATA[<b>By post:</b>]]></source>
 				<target><![CDATA[<b>Per Post:</b>]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.jobApplyNow" approved="yes">
+			<trans-unit id="frontend.jobApplyNow" resname="frontend.jobApplyNow" approved="yes">
 				<source><![CDATA[Interested?<br>– Apply now!]]></source>
 				<target><![CDATA[Interesse geweckt?<br>– Dann bewirb dich jetzt!]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.jobDetailsCta" approved="yes">
+			<trans-unit id="frontend.jobDetailsCta" resname="frontend.jobDetailsCta" approved="yes">
 				<source><![CDATA[To the details]]></source>
 				<target><![CDATA[Zu den Details]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.jobLocationRemote" approved="yes">
+			<trans-unit id="frontend.jobLocationRemote" resname="frontend.jobLocationRemote" approved="yes">
 				<source><![CDATA[<b>Location:</b> Where you want - we work completely remotely!]]></source>
 				<target><![CDATA[<b>Standort:</b> Wo du willst – wir arbeiten komplett remote!]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.jobStart" approved="yes">
+			<trans-unit id="frontend.jobStart" resname="frontend.jobStart" approved="yes">
 				<source><![CDATA[<b>Start:</b>]]></source>
 				<target><![CDATA[<b>Start:</b>]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.listAll.item" approved="yes">
+			<trans-unit id="frontend.listAll.item" resname="frontend.listAll.item" approved="yes">
 				<source><![CDATA[Item]]></source>
 				<target><![CDATA[Eintrag]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.location" approved="yes">
+			<trans-unit id="frontend.location" resname="frontend.location" approved="yes">
 				<source><![CDATA[Location]]></source>
 				<target><![CDATA[Standort]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.locationCountLabel" approved="yes">
+			<trans-unit id="frontend.locationCountLabel" resname="frontend.locationCountLabel" approved="yes">
 				<source><![CDATA[Locations]]></source>
 				<target><![CDATA[Standorte]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.locationLabel" approved="yes">
+			<trans-unit id="frontend.locationLabel" resname="frontend.locationLabel" approved="yes">
 				<source><![CDATA[<b>Location:</b>]]></source>
 				<target><![CDATA[<b>Standort:</b>]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.organisation" approved="yes">
+			<trans-unit id="frontend.organisation" resname="frontend.organisation" approved="yes">
 				<source><![CDATA[Organisation]]></source>
 				<target><![CDATA[Organisation]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.phone" approved="yes">
+			<trans-unit id="frontend.phone" resname="frontend.phone" approved="yes">
 				<source><![CDATA[Phone]]></source>
 				<target><![CDATA[Telefon]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.qualification" approved="yes">
+			<trans-unit id="frontend.qualification" resname="frontend.qualification" approved="yes">
 				<source><![CDATA[Qualification]]></source>
 				<target><![CDATA[Qualifikation]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.remote" approved="yes">
+			<trans-unit id="frontend.remote" resname="frontend.remote" approved="yes">
 				<source><![CDATA[Remote]]></source>
 				<target><![CDATA[Remote]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.task" approved="yes">
+			<trans-unit id="frontend.task" resname="frontend.task" approved="yes">
 				<source><![CDATA[Task]]></source>
 				<target><![CDATA[Aufgabe]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.teaserHeadline" approved="yes">
+			<trans-unit id="frontend.teaserHeadline" resname="frontend.teaserHeadline" approved="yes">
 				<source><![CDATA[Vacancies worldwide]]></source>
 				<target><![CDATA[Offene Stellen weltweit]]></target>
 			</trans-unit>
 		</body>
 	</file>
-</xliff>
+</xliff>
\ No newline at end of file
diff --git a/Resources/Private/Language/de.locallang_backend.xlf b/Resources/Private/Language/de.locallang_backend.xlf
index 5d3c9ef7382c59e2dc073591c690f9a241a3c8a9..0d37d46632ff530a7438d95d095b8761fccd7670 100644
--- a/Resources/Private/Language/de.locallang_backend.xlf
+++ b/Resources/Private/Language/de.locallang_backend.xlf
@@ -1,74 +1,74 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2016-05-03T16:26:21Z">
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+	<file source-language="en" target-language="de" datatype="plaintext" original="EXT:sg_jobs/Resources/Private/Language/locallang_backend.xlf" date="2024-01-18T20:23:31Z">
 		<header>
 			<type>module</type>
-			<description>Language labels for the backend module belonging to extension 'sg_jobs'</description>
+			<description>Language labels for the backend module belonging to extension &#039;sg_jobs&#039;</description>
 			<generator>LFEditor</generator>
 			<authorName>Fabian Galinski</authorName>
 			<authorEmail>fabian@sgalinski.de</authorEmail>
 		</header>
 		<body>
-			<trans-unit id="applyPlugin" approved="yes">
-				<source>[Jobs] Job Application Form</source>
-				<target>[Jobs] Bewerbungsformular</target>
+			<trans-unit id="applyPlugin" resname="applyPlugin" approved="yes">
+				<source><![CDATA[[Jobs] Job Application Form]]></source>
+				<target><![CDATA[[Jobs] Bewerbungsformular]]></target>
 			</trans-unit>
-			<trans-unit id="applyPluginDescription" approved="yes">
-				<source>Useful for spontaneous applications.</source>
-				<target>Nützlich für Initiativbewerbungen.</target>
+			<trans-unit id="applyPluginDescription" resname="applyPluginDescription" approved="yes">
+				<source><![CDATA[Useful for spontaneous applications.]]></source>
+				<target><![CDATA[Nützlich für Initiativbewerbungen.]]></target>
 			</trans-unit>
-			<trans-unit id="applyPluginTitle" approved="yes">
-				<source>Job Application Form</source>
-				<target>Bewerbungsformular</target>
+			<trans-unit id="applyPluginTitle" resname="applyPluginTitle" approved="yes">
+				<source><![CDATA[Job Application Form]]></source>
+				<target><![CDATA[Bewerbungsformular]]></target>
 			</trans-unit>
-			<trans-unit id="backend.plugin.preview.settings" approved="yes">
+			<trans-unit id="backend.plugin.preview.settings" resname="backend.plugin.preview.settings" approved="yes">
 				<source><![CDATA[Settings]]></source>
 				<target><![CDATA[Einstellungen]]></target>
 			</trans-unit>
-			<trans-unit id="backend.plugin.preview.storagePages" approved="yes">
+			<trans-unit id="backend.plugin.preview.storagePages" resname="backend.plugin.preview.storagePages" approved="yes">
 				<source><![CDATA[Storage pages of job offers]]></source>
 				<target><![CDATA[Seiten, deren Stellenanzeigen verwendet werden]]></target>
 			</trans-unit>
-			<trans-unit id="backend.plugin.preview.values" approved="yes">
+			<trans-unit id="backend.plugin.preview.values" resname="backend.plugin.preview.values" approved="yes">
 				<source><![CDATA[Values]]></source>
 				<target><![CDATA[Werte]]></target>
 			</trans-unit>
-			<trans-unit id="jobteaserPluginTitle" approved="yes">
-				<source>Job Teaser</source>
-				<target>Teaser für ein Stellenangebot.</target>
+			<trans-unit id="jobteaserPluginTitle" resname="jobteaserPluginTitle" approved="yes">
+				<source><![CDATA[Job Teaser]]></source>
+				<target><![CDATA[Teaser für ein Stellenangebot.]]></target>
 			</trans-unit>
-			<trans-unit id="listPlugin" approved="yes">
-				<source>[Jobs] Joblist</source>
-				<target>[Jobs] Liste der Stellenangebote</target>
+			<trans-unit id="listPlugin" resname="listPlugin" approved="yes">
+				<source><![CDATA[[Jobs] Job List]]></source>
+				<target><![CDATA[[Jobs] Liste der Stellenangebote]]></target>
 			</trans-unit>
-			<trans-unit id="listPluginDescription" approved="yes">
-				<source>Overview of all jobs.</source>
-				<target>Übersicht über alle Stellenangebote.</target>
+			<trans-unit id="listPluginDescription" resname="listPluginDescription" approved="yes">
+				<source><![CDATA[Overview of all jobs.]]></source>
+				<target><![CDATA[Übersicht über alle Stellenangebote.]]></target>
 			</trans-unit>
-			<trans-unit id="listPluginTitle" approved="yes">
-				<source>Job List</source>
-				<target>Liste der Stellenangebote</target>
+			<trans-unit id="listPluginTitle" resname="listPluginTitle" approved="yes">
+				<source><![CDATA[Job List]]></source>
+				<target><![CDATA[Liste der Stellenangebote]]></target>
 			</trans-unit>
-			<trans-unit id="mlang_labels_tabdescr" approved="yes">
-				<source>Job Offers</source>
-				<target>Stellenangebote</target>
+			<trans-unit id="mlang_labels_tabdescr" resname="mlang_labels_tabdescr" approved="yes">
+				<source><![CDATA[Job Offers]]></source>
+				<target><![CDATA[Stellenangebote]]></target>
 			</trans-unit>
-			<trans-unit id="mlang_labels_tablabel" approved="yes">
-				<source>Job Offers</source>
-				<target>Stellenangebote</target>
+			<trans-unit id="mlang_labels_tablabel" resname="mlang_labels_tablabel" approved="yes">
+				<source><![CDATA[Job Offers]]></source>
+				<target><![CDATA[Stellenangebote]]></target>
 			</trans-unit>
-			<trans-unit id="mlang_tabs_tab" approved="yes">
-				<source>Job Offers</source>
-				<target>Liste der Stellenangebote</target>
+			<trans-unit id="mlang_tabs_tab" resname="mlang_tabs_tab" approved="yes">
+				<source><![CDATA[Job Offers]]></source>
+				<target><![CDATA[Liste der Stellenangebote]]></target>
 			</trans-unit>
-			<trans-unit id="teaserPlugin" approved="yes">
-				<source>[Jobs] Job Teaser</source>
-				<target>[Jobs] Teaser für ein Stellenangebot</target>
+			<trans-unit id="teaserPlugin" resname="teaserPlugin" approved="yes">
+				<source><![CDATA[[Jobs] Job Teaser]]></source>
+				<target><![CDATA[[Jobs] Teaser für ein Stellenangebot]]></target>
 			</trans-unit>
-			<trans-unit id="teaserPluginDescription" approved="yes">
-				<source>Show a teaser for one job.</source>
-				<target>Ein Teaser für ein Stellenangebot.</target>
+			<trans-unit id="teaserPluginDescription" resname="teaserPluginDescription" approved="yes">
+				<source><![CDATA[Show a teaser for one job.]]></source>
+				<target><![CDATA[Ein Teaser für ein Stellenangebot.]]></target>
 			</trans-unit>
 		</body>
 	</file>
-</xliff>
+</xliff>
\ No newline at end of file
diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
index 3b0f2a5f732451299df44695b1e7a40819dc4589..18d7d7ce01166cd99d52ccebc1f6cd9697e41358 100644
--- a/Resources/Private/Language/locallang.xlf
+++ b/Resources/Private/Language/locallang.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" datatype="plaintext" original="messages" date="2023-09-06T17:30:53Z">
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+	<file source-language="en" datatype="plaintext" original="EXT:sg_jobs/Resources/Private/Language/locallang.xlf" date="2024-01-18T20:23:37Z">
 		<header>
 			<type>module</type>
 			<description>General language labels used in frontend and backend.</description>
@@ -9,408 +9,408 @@
 			<authorEmail>fabian@sgalinski.de</authorEmail>
 		</header>
 		<body>
-			<trans-unit id="application_mail.marker.birthdate">
+			<trans-unit id="application_mail.marker.birthdate" resname="application_mail.marker.birthdate">
 				<source><![CDATA[Date of birth]]></source>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.city">
+			<trans-unit id="application_mail.marker.city" resname="application_mail.marker.city">
 				<source><![CDATA[City]]></source>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.country">
+			<trans-unit id="application_mail.marker.country" resname="application_mail.marker.country">
 				<source><![CDATA[Country]]></source>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.education">
+			<trans-unit id="application_mail.marker.education" resname="application_mail.marker.education">
 				<source><![CDATA[Education]]></source>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.email">
+			<trans-unit id="application_mail.marker.email" resname="application_mail.marker.email">
 				<source><![CDATA[Email]]></source>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.firstname">
+			<trans-unit id="application_mail.marker.firstname" resname="application_mail.marker.firstname">
 				<source><![CDATA[First name]]></source>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.gender">
+			<trans-unit id="application_mail.marker.freetextField1" resname="application_mail.marker.freetextField1">
+				<source><![CDATA[Free text field 1]]></source>
+			</trans-unit>
+			<trans-unit id="application_mail.marker.freetextField2" resname="application_mail.marker.freetextField2">
+				<source><![CDATA[Free text field 2]]></source>
+			</trans-unit>
+			<trans-unit id="application_mail.marker.freetextField3" resname="application_mail.marker.freetextField3">
+				<source><![CDATA[Free text field 3]]></source>
+			</trans-unit>
+			<trans-unit id="application_mail.marker.freetextField4" resname="application_mail.marker.freetextField4">
+				<source><![CDATA[Free text field 4]]></source>
+			</trans-unit>
+			<trans-unit id="application_mail.marker.freetextField5" resname="application_mail.marker.freetextField5">
+				<source><![CDATA[Free text field 5]]></source>
+			</trans-unit>
+			<trans-unit id="application_mail.marker.gender" resname="application_mail.marker.gender">
 				<source><![CDATA[Gender]]></source>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.jobtitle">
+			<trans-unit id="application_mail.marker.jobtitle" resname="application_mail.marker.jobtitle">
 				<source><![CDATA[Job title]]></source>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.lastname">
+			<trans-unit id="application_mail.marker.lastname" resname="application_mail.marker.lastname">
 				<source><![CDATA[Last name]]></source>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.location">
+			<trans-unit id="application_mail.marker.location" resname="application_mail.marker.location">
 				<source><![CDATA[The location regarding the unsolicited application]]></source>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.message">
+			<trans-unit id="application_mail.marker.message" resname="application_mail.marker.message">
 				<source><![CDATA[Message]]></source>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.mobile">
+			<trans-unit id="application_mail.marker.mobile" resname="application_mail.marker.mobile">
 				<source><![CDATA[Mobile]]></source>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.nationality">
+			<trans-unit id="application_mail.marker.nationality" resname="application_mail.marker.nationality">
 				<source><![CDATA[Nationality]]></source>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.phone">
+			<trans-unit id="application_mail.marker.phone" resname="application_mail.marker.phone">
 				<source><![CDATA[Phone]]></source>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.salutation">
+			<trans-unit id="application_mail.marker.salutation" resname="application_mail.marker.salutation">
 				<source><![CDATA[Salutation]]></source>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.street">
+			<trans-unit id="application_mail.marker.street" resname="application_mail.marker.street">
 				<source><![CDATA[Street]]></source>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.zip">
+			<trans-unit id="application_mail.marker.zip" resname="application_mail.marker.zip">
 				<source><![CDATA[Zip]]></source>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.freetextField1">
-				<source><![CDATA[Free text field 1]]></source>
-			</trans-unit>
-			<trans-unit id="application_mail.marker.freetextField2">
-				<source><![CDATA[Free text field 2]]></source>
-			</trans-unit>
-			<trans-unit id="application_mail.marker.freetextField3">
-				<source><![CDATA[Free text field 3]]></source>
-			</trans-unit>
-			<trans-unit id="application_mail.marker.freetextField4">
-				<source><![CDATA[Free text field 4]]></source>
-			</trans-unit>
-			<trans-unit id="application_mail.marker.freetextField5">
-				<source><![CDATA[Free text field 5]]></source>
-			</trans-unit>
-			<trans-unit id="backend.button_create">
+			<trans-unit id="backend.button_create" resname="backend.button_create">
 				<source><![CDATA[New]]></source>
 			</trans-unit>
-			<trans-unit id="backend.button_create_job">
+			<trans-unit id="backend.button_create_job" resname="backend.button_create_job">
 				<source><![CDATA[New job offer]]></source>
 			</trans-unit>
-			<trans-unit id="backend.button_create_location">
+			<trans-unit id="backend.button_create_location" resname="backend.button_create_location">
 				<source><![CDATA[New location]]></source>
 			</trans-unit>
-			<trans-unit id="backend.filter">
+			<trans-unit id="backend.filter" resname="backend.filter">
 				<source><![CDATA[Filter]]></source>
 			</trans-unit>
-			<trans-unit id="backend.filters.editLocation">
+			<trans-unit id="backend.filters.editLocation" resname="backend.filters.editLocation">
 				<source><![CDATA[Edit selected location]]></source>
 			</trans-unit>
-			<trans-unit id="backend.filters.locations">
+			<trans-unit id="backend.filters.locations" resname="backend.filters.locations">
 				<source><![CDATA[Locations]]></source>
 			</trans-unit>
-			<trans-unit id="backend.filters.locations.description">
+			<trans-unit id="backend.filters.locations.description" resname="backend.filters.locations.description">
 				<source><![CDATA[(Use the ctrl or cmd keys to deselect an option or to select multiple options) ]]></source>
 			</trans-unit>
-			<trans-unit id="backend.filters.search">
+			<trans-unit id="backend.filters.search" resname="backend.filters.search">
 				<source><![CDATA[Search]]></source>
 			</trans-unit>
-			<trans-unit id="backend.jobs.header">
+			<trans-unit id="backend.jobs.header" resname="backend.jobs.header">
 				<source><![CDATA[Job offers]]></source>
 			</trans-unit>
-			<trans-unit id="backend.list.header">
+			<trans-unit id="backend.list.header" resname="backend.list.header">
 				<source><![CDATA[Header]]></source>
 			</trans-unit>
-			<trans-unit id="backend.list.item">
+			<trans-unit id="backend.list.item" resname="backend.list.item">
 				<source><![CDATA[Item]]></source>
 			</trans-unit>
-			<trans-unit id="backend.manualSortingBug">
+			<trans-unit id="backend.manualSortingBug" resname="backend.manualSortingBug">
 				<source><![CDATA[Manual sorting is currently not working. You can do that in the List module.]]></source>
 			</trans-unit>
-			<trans-unit id="backend.message.error">
+			<trans-unit id="backend.message.error" resname="backend.message.error">
 				<source><![CDATA[Something went wrong. Please reload.]]></source>
 			</trans-unit>
-			<trans-unit id="backend.noJobsMessage">
+			<trans-unit id="backend.noJobsMessage" resname="backend.noJobsMessage">
 				<source><![CDATA[There are no jobs that match your criteria]]></source>
 			</trans-unit>
-			<trans-unit id="backend.notice.noRecords">
+			<trans-unit id="backend.notice.noRecords" resname="backend.notice.noRecords">
 				<source><![CDATA[There are no records on this page]]></source>
 			</trans-unit>
-			<trans-unit id="backend.reset_filter">
+			<trans-unit id="backend.reset_filter" resname="backend.reset_filter">
 				<source><![CDATA[Reset filter]]></source>
 			</trans-unit>
-			<trans-unit id="backend.selectRootPage">
+			<trans-unit id="backend.selectRootPage" resname="backend.selectRootPage">
 				<source><![CDATA[Please select one of the following pages:]]></source>
 			</trans-unit>
-			<trans-unit id="configuration.jobFolderPath">
-				<source><![CDATA[Job Folder Path (Relative to fileadmin, defaults to "JobApplication")]]></source>
-			</trans-unit>
-			<trans-unit id="configuration.applicantMail">
+			<trans-unit id="configuration.applicantMail" resname="configuration.applicantMail">
 				<source><![CDATA[Send confirmation e-mail to applicants (sg_mail template "applicant_mail")]]></source>
 			</trans-unit>
-			<trans-unit id="error.NoSuchArgumentException">
+			<trans-unit id="configuration.jobFolderPath" resname="configuration.jobFolderPath">
+				<source><![CDATA[Job Folder Path (Relative to fileadmin, defaults to "JobApplication")]]></source>
+			</trans-unit>
+			<trans-unit id="error.NoSuchArgumentException" resname="error.NoSuchArgumentException">
 				<source><![CDATA[Some file could not be uploaded. Is it too large?]]></source>
 			</trans-unit>
-			<trans-unit id="error.TypeConverterException.missing.">
+			<trans-unit id="error.TypeConverterException.missing." resname="error.TypeConverterException.missing.">
 				<source><![CDATA[Missing some file]]></source>
 			</trans-unit>
-			<trans-unit id="error.TypeConverterException.missing.certificate">
+			<trans-unit id="error.TypeConverterException.missing.certificate" resname="error.TypeConverterException.missing.certificate">
 				<source><![CDATA[Missing certificate file]]></source>
 			</trans-unit>
-			<trans-unit id="error.TypeConverterException.missing.coverLetter">
+			<trans-unit id="error.TypeConverterException.missing.coverLetter" resname="error.TypeConverterException.missing.coverLetter">
 				<source><![CDATA[Missing coverletter file]]></source>
 			</trans-unit>
-			<trans-unit id="error.TypeConverterException.missing.cv">
+			<trans-unit id="error.TypeConverterException.missing.cv" resname="error.TypeConverterException.missing.cv">
 				<source><![CDATA[Missing cv file]]></source>
 			</trans-unit>
-			<trans-unit id="error.TypeConverterException.type">
+			<trans-unit id="error.TypeConverterException.type" resname="error.TypeConverterException.type">
 				<source><![CDATA[File extension is not allowed!]]></source>
 			</trans-unit>
-			<trans-unit id="error.maxFileSizeMessage">
+			<trans-unit id="error.maxFileSizeMessage" resname="error.maxFileSizeMessage">
 				<source><![CDATA[The selected file exceeds the maximum file size]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.CancelUpload">
+			<trans-unit id="frontend.CancelUpload" resname="frontend.CancelUpload">
 				<source><![CDATA[Stop upload]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.DropFiles">
+			<trans-unit id="frontend.DropFiles" resname="frontend.DropFiles">
 				<source><![CDATA[Drop file here]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.FileType">
+			<trans-unit id="frontend.FileType" resname="frontend.FileType">
 				<source><![CDATA[Filetype]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.RemoveFile">
+			<trans-unit id="frontend.RemoveFile" resname="frontend.RemoveFile">
 				<source><![CDATA[Remove file]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.allVacancies">
+			<trans-unit id="frontend.allVacancies" resname="frontend.allVacancies">
 				<source><![CDATA[All vacancies]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.allowed_file_extensions">
+			<trans-unit id="frontend.apply.allowed_file_extensions" resname="frontend.apply.allowed_file_extensions">
 				<source><![CDATA[File types: ]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.applyAs">
+			<trans-unit id="frontend.apply.applyAs" resname="frontend.apply.applyAs">
 				<source><![CDATA[Apply as]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.applyAsNow">
+			<trans-unit id="frontend.apply.applyAsNow" resname="frontend.apply.applyAsNow">
 				<source><![CDATA[Apply now as %s]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.birthDate">
+			<trans-unit id="frontend.apply.birthDate" resname="frontend.apply.birthDate">
 				<source><![CDATA[Birth date *]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.certificate">
+			<trans-unit id="frontend.apply.certificate" resname="frontend.apply.certificate">
 				<source><![CDATA[Certificate *]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.city">
+			<trans-unit id="frontend.apply.city" resname="frontend.apply.city">
 				<source><![CDATA[City *]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.company">
+			<trans-unit id="frontend.apply.company" resname="frontend.apply.company">
 				<source><![CDATA[Location *]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.contact">
+			<trans-unit id="frontend.apply.contact" resname="frontend.apply.contact">
 				<source><![CDATA[Your contact]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.country">
+			<trans-unit id="frontend.apply.country" resname="frontend.apply.country">
 				<source><![CDATA[Country *]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.country.empty">
+			<trans-unit id="frontend.apply.country.empty" resname="frontend.apply.country.empty">
 				<source><![CDATA[Please choose]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.cover_letter">
+			<trans-unit id="frontend.apply.cover_letter" resname="frontend.apply.cover_letter">
 				<source><![CDATA[Cover letter *]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.cv">
+			<trans-unit id="frontend.apply.cv" resname="frontend.apply.cv">
 				<source><![CDATA[CV *]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.education">
+			<trans-unit id="frontend.apply.education" resname="frontend.apply.education">
 				<source><![CDATA[Highest achieved education *]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.email">
+			<trans-unit id="frontend.apply.email" resname="frontend.apply.email">
 				<source><![CDATA[Email *]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.error.general">
+			<trans-unit id="frontend.apply.error.general" resname="frontend.apply.error.general">
 				<source><![CDATA[An error has occured]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.first_name">
+			<trans-unit id="frontend.apply.first_name" resname="frontend.apply.first_name">
 				<source><![CDATA[First name *]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.gender">
+			<trans-unit id="frontend.apply.gender" resname="frontend.apply.gender">
 				<source><![CDATA[Gender]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.gender.female">
+			<trans-unit id="frontend.apply.gender.female" resname="frontend.apply.gender.female">
 				<source><![CDATA[Female]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.gender.male">
+			<trans-unit id="frontend.apply.gender.male" resname="frontend.apply.gender.male">
 				<source><![CDATA[Male]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.gender.other">
+			<trans-unit id="frontend.apply.gender.other" resname="frontend.apply.gender.other">
 				<source><![CDATA[Other]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.last_name">
+			<trans-unit id="frontend.apply.last_name" resname="frontend.apply.last_name">
 				<source><![CDATA[Last name *]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.location">
+			<trans-unit id="frontend.apply.location" resname="frontend.apply.location">
 				<source><![CDATA[Location *]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.maxFileSize">
+			<trans-unit id="frontend.apply.maxFileSize" resname="frontend.apply.maxFileSize">
 				<source><![CDATA[Maximum file size:]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.message">
+			<trans-unit id="frontend.apply.message" resname="frontend.apply.message">
 				<source><![CDATA[Message]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.mobile">
+			<trans-unit id="frontend.apply.mobile" resname="frontend.apply.mobile">
 				<source><![CDATA[Mobile]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.nationality">
+			<trans-unit id="frontend.apply.nationality" resname="frontend.apply.nationality">
 				<source><![CDATA[Nationality *]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.nationality.empty">
+			<trans-unit id="frontend.apply.nationality.empty" resname="frontend.apply.nationality.empty">
 				<source><![CDATA[Please choose]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.phone">
+			<trans-unit id="frontend.apply.phone" resname="frontend.apply.phone">
 				<source><![CDATA[Phone *]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.privacyPolicy">
+			<trans-unit id="frontend.apply.privacyPolicy" resname="frontend.apply.privacyPolicy">
 				<source><![CDATA[I have read the %s and confirm the usage of my personal data according to it. *]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.privacyPolicy.link">
+			<trans-unit id="frontend.apply.privacyPolicy.link" resname="frontend.apply.privacyPolicy.link">
 				<source><![CDATA[privacy policy]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.recommend">
+			<trans-unit id="frontend.apply.recommend" resname="frontend.apply.recommend">
 				<source><![CDATA[Recommend job]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.relatedJobs">
+			<trans-unit id="frontend.apply.relatedJobs" resname="frontend.apply.relatedJobs">
 				<source><![CDATA[Related Jobs]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.salutation">
+			<trans-unit id="frontend.apply.salutation" resname="frontend.apply.salutation">
 				<source><![CDATA[Salutation]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.street">
+			<trans-unit id="frontend.apply.street" resname="frontend.apply.street">
 				<source><![CDATA[Street *]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.thank_you">
+			<trans-unit id="frontend.apply.thank_you" resname="frontend.apply.thank_you">
 				<source><![CDATA[Thank you for your application!]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.title">
+			<trans-unit id="frontend.apply.title" resname="frontend.apply.title">
 				<source><![CDATA[Job title *]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.unsolicitedApplication">
+			<trans-unit id="frontend.apply.unsolicitedApplication" resname="frontend.apply.unsolicitedApplication">
 				<source><![CDATA[Unsolicited Application]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply.zip">
+			<trans-unit id="frontend.apply.zip" resname="frontend.apply.zip">
 				<source><![CDATA[Zip *]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.applyNow">
+			<trans-unit id="frontend.applyNow" resname="frontend.applyNow">
 				<source><![CDATA[Apply online now]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.applyNow.emptyApplication">
+			<trans-unit id="frontend.applyNow.emptyApplication" resname="frontend.applyNow.emptyApplication">
 				<source><![CDATA[Apply to an unlisted position]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.apply_by_mail">
+			<trans-unit id="frontend.apply_by_mail" resname="frontend.apply_by_mail">
 				<source><![CDATA[Apply by mail]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.attachment">
+			<trans-unit id="frontend.attachment" resname="frontend.attachment">
 				<source><![CDATA[Download job advertisement]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.certificateUplodadButton">
+			<trans-unit id="frontend.certificateUplodadButton" resname="frontend.certificateUplodadButton">
 				<source><![CDATA[Upload certificate]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.coverLetterUplodadButton">
+			<trans-unit id="frontend.coverLetterUplodadButton" resname="frontend.coverLetterUplodadButton">
 				<source><![CDATA[Upload coverletter]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.cvUplodadButton">
+			<trans-unit id="frontend.cvUplodadButton" resname="frontend.cvUplodadButton">
 				<source><![CDATA[Upload cv]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.department">
+			<trans-unit id="frontend.department" resname="frontend.department">
 				<source><![CDATA[Department]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.description">
+			<trans-unit id="frontend.description" resname="frontend.description">
 				<source><![CDATA[Description]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.detail.back">
+			<trans-unit id="frontend.detail.back" resname="frontend.detail.back">
 				<source><![CDATA[Back]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.detail.header">
+			<trans-unit id="frontend.detail.header" resname="frontend.detail.header">
 				<source><![CDATA[Header]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.email">
+			<trans-unit id="frontend.email" resname="frontend.email">
 				<source><![CDATA[Apply by email]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.emailContact">
+			<trans-unit id="frontend.emailContact" resname="frontend.emailContact">
 				<source><![CDATA[Email Contact]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.entry_date">
+			<trans-unit id="frontend.entry_date" resname="frontend.entry_date">
 				<source><![CDATA[Entry date]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.experienceLevel">
+			<trans-unit id="frontend.experienceLevel" resname="frontend.experienceLevel">
 				<source><![CDATA[Experience Level]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.filter.companies">
+			<trans-unit id="frontend.filter.companies" resname="frontend.filter.companies">
 				<source><![CDATA[Company]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.filter.countries">
+			<trans-unit id="frontend.filter.countries" resname="frontend.filter.countries">
 				<source><![CDATA[Country]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.filter.countriesfunctions">
+			<trans-unit id="frontend.filter.countriesfunctions" resname="frontend.filter.countriesfunctions">
 				<source><![CDATA[Function]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.filter.departments">
+			<trans-unit id="frontend.filter.departments" resname="frontend.filter.departments">
 				<source><![CDATA[Departments]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.filter.experienceLevels">
+			<trans-unit id="frontend.filter.experienceLevels" resname="frontend.filter.experienceLevels">
 				<source><![CDATA[Experience Level]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.filter.functions">
+			<trans-unit id="frontend.filter.functions" resname="frontend.filter.functions">
 				<source><![CDATA[Function]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.filter.locations">
+			<trans-unit id="frontend.filter.locations" resname="frontend.filter.locations">
 				<source><![CDATA[Location]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.filter.remote">
+			<trans-unit id="frontend.filter.remote" resname="frontend.filter.remote">
 				<source><![CDATA[Show fully remote jobs only]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.filter.selections.all">
+			<trans-unit id="frontend.filter.selections.all" resname="frontend.filter.selections.all">
 				<source><![CDATA[All]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.filter.submit">
+			<trans-unit id="frontend.filter.submit" resname="frontend.filter.submit">
 				<source><![CDATA[Filter]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.function">
+			<trans-unit id="frontend.function" resname="frontend.function">
 				<source><![CDATA[Function]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.job.suggestForm">
+			<trans-unit id="frontend.job.suggestForm" resname="frontend.job.suggestForm">
 				<source><![CDATA[<b>Or use the online form</b>]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.job.via.email">
+			<trans-unit id="frontend.job.via.email" resname="frontend.job.via.email">
 				<source><![CDATA[<b>By email:</b>]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.job.via.post">
+			<trans-unit id="frontend.job.via.post" resname="frontend.job.via.post">
 				<source><![CDATA[<b>By post:</b>]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.jobApplyNow">
+			<trans-unit id="frontend.jobApplyNow" resname="frontend.jobApplyNow">
 				<source><![CDATA[Interested?<br>– Apply now!]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.jobDetailsCta">
+			<trans-unit id="frontend.jobDetailsCta" resname="frontend.jobDetailsCta">
 				<source><![CDATA[To the details]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.jobLocationRemote">
+			<trans-unit id="frontend.jobLocationRemote" resname="frontend.jobLocationRemote">
 				<source><![CDATA[<b>Location:</b> Where you want - we work completely remotely!]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.jobStart">
+			<trans-unit id="frontend.jobStart" resname="frontend.jobStart">
 				<source><![CDATA[<b>Start:</b>]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.listAll.item">
+			<trans-unit id="frontend.listAll.item" resname="frontend.listAll.item">
 				<source><![CDATA[Item]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.location">
+			<trans-unit id="frontend.location" resname="frontend.location">
 				<source><![CDATA[Location]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.locationCountLabel">
+			<trans-unit id="frontend.locationCountLabel" resname="frontend.locationCountLabel">
 				<source><![CDATA[Locations]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.locationLabel">
+			<trans-unit id="frontend.locationLabel" resname="frontend.locationLabel">
 				<source><![CDATA[<b>Location:</b>]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.organisation">
+			<trans-unit id="frontend.organisation" resname="frontend.organisation">
 				<source><![CDATA[Organisation]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.phone">
+			<trans-unit id="frontend.phone" resname="frontend.phone">
 				<source><![CDATA[Phone]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.qualification">
+			<trans-unit id="frontend.qualification" resname="frontend.qualification">
 				<source><![CDATA[Qualification]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.remote">
+			<trans-unit id="frontend.remote" resname="frontend.remote">
 				<source><![CDATA[Remote]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.task">
+			<trans-unit id="frontend.task" resname="frontend.task">
 				<source><![CDATA[Task]]></source>
 			</trans-unit>
-			<trans-unit id="frontend.teaserHeadline">
+			<trans-unit id="frontend.teaserHeadline" resname="frontend.teaserHeadline">
 				<source><![CDATA[Vacancies worldwide]]></source>
 			</trans-unit>
 		</body>
 	</file>
-</xliff>
+</xliff>
\ No newline at end of file
diff --git a/Resources/Private/Language/locallang_backend.xlf b/Resources/Private/Language/locallang_backend.xlf
index fd1fec6f7eeacf6688234bd27bb3e79aeb02fcb1..d3a04e27b09d172578fcce98dd4ae349009702c1 100644
--- a/Resources/Private/Language/locallang_backend.xlf
+++ b/Resources/Private/Language/locallang_backend.xlf
@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" datatype="plaintext" original="messages" date="2016-05-03T16:26:21Z">
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+	<file source-language="en" datatype="plaintext" original="EXT:sg_jobs/Resources/Private/Language/locallang_backend.xlf" date="2024-01-18T20:23:31Z">
 		<header>
 			<type>module</type>
-			<description>Language labels for the backend module belonging to extension 'sg_jobs'</description>
+			<description>Language labels for the backend module belonging to extension &#039;sg_jobs&#039;</description>
 			<generator>LFEditor</generator>
 			<authorName>Fabian Galinski</authorName>
 			<authorEmail>fabian@sgalinski.de</authorEmail>
 		</header>
 		<body>
-			<trans-unit id="applyPlugin">
-				<source>[Jobs] Job Application Form</source>
+			<trans-unit id="applyPlugin" resname="applyPlugin">
+				<source><![CDATA[[Jobs] Job Application Form]]></source>
 			</trans-unit>
-			<trans-unit id="applyPluginDescription">
-				<source>Useful for spontaneous applications.</source>
+			<trans-unit id="applyPluginDescription" resname="applyPluginDescription">
+				<source><![CDATA[Useful for spontaneous applications.]]></source>
 			</trans-unit>
-			<trans-unit id="applyPluginLabel">
-				<source>[Jobs] Jobs Plugin</source>
+			<trans-unit id="applyPluginLabel" resname="applyPluginLabel">
+				<source><![CDATA[[Jobs] Jobs Plugin]]></source>
 			</trans-unit>
-			<trans-unit id="applyPluginTitle">
-				<source>Job Application Form</source>
+			<trans-unit id="applyPluginTitle" resname="applyPluginTitle">
+				<source><![CDATA[Job Application Form]]></source>
 			</trans-unit>
-			<trans-unit id="backend.plugin.preview.settings">
+			<trans-unit id="backend.plugin.preview.settings" resname="backend.plugin.preview.settings">
 				<source><![CDATA[Settings]]></source>
 			</trans-unit>
-			<trans-unit id="backend.plugin.preview.storagePages">
+			<trans-unit id="backend.plugin.preview.storagePages" resname="backend.plugin.preview.storagePages">
 				<source><![CDATA[Storage pages of job offers]]></source>
 			</trans-unit>
-			<trans-unit id="backend.plugin.preview.values">
+			<trans-unit id="backend.plugin.preview.values" resname="backend.plugin.preview.values">
 				<source><![CDATA[Values]]></source>
 			</trans-unit>
-			<trans-unit id="galinskiPluginLabel">
-				<source>SGalinski Plugins</source>
+			<trans-unit id="galinskiPluginLabel" resname="galinskiPluginLabel">
+				<source><![CDATA[SGalinski Plugins]]></source>
 			</trans-unit>
-			<trans-unit id="jobteaserPluginTitle">
-				<source>Job Teaser</source>
+			<trans-unit id="jobteaserPluginTitle" resname="jobteaserPluginTitle">
+				<source><![CDATA[Job Teaser]]></source>
 			</trans-unit>
-			<trans-unit id="listPlugin">
-				<source>[Jobs] Job List</source>
+			<trans-unit id="listPlugin" resname="listPlugin">
+				<source><![CDATA[[Jobs] Job List]]></source>
 			</trans-unit>
-			<trans-unit id="listPluginDescription">
-				<source>Overview of all jobs.</source>
+			<trans-unit id="listPluginDescription" resname="listPluginDescription">
+				<source><![CDATA[Overview of all jobs.]]></source>
 			</trans-unit>
-			<trans-unit id="listPluginTitle">
-				<source>Job List</source>
+			<trans-unit id="listPluginTitle" resname="listPluginTitle">
+				<source><![CDATA[Job List]]></source>
 			</trans-unit>
-			<trans-unit id="mlang_labels_tabdescr">
-				<source>Job Offers</source>
+			<trans-unit id="mlang_labels_tabdescr" resname="mlang_labels_tabdescr">
+				<source><![CDATA[Job Offers]]></source>
 			</trans-unit>
-			<trans-unit id="mlang_labels_tablabel">
-				<source>Job Offers</source>
+			<trans-unit id="mlang_labels_tablabel" resname="mlang_labels_tablabel">
+				<source><![CDATA[Job Offers]]></source>
 			</trans-unit>
-			<trans-unit id="mlang_tabs_tab">
-				<source>Job Offers</source>
+			<trans-unit id="mlang_tabs_tab" resname="mlang_tabs_tab">
+				<source><![CDATA[Job Offers]]></source>
 			</trans-unit>
-			<trans-unit id="teaserPlugin">
-				<source>[Jobs] Job Teaser</source>
+			<trans-unit id="teaserPlugin" resname="teaserPlugin">
+				<source><![CDATA[[Jobs] Job Teaser]]></source>
 			</trans-unit>
-			<trans-unit id="teaserPluginDescription">
-				<source>Show a teaser for one job.</source>
+			<trans-unit id="teaserPluginDescription" resname="teaserPluginDescription">
+				<source><![CDATA[Show a teaser for one job.]]></source>
 			</trans-unit>
 		</body>
 	</file>
-</xliff>
+</xliff>
\ No newline at end of file
diff --git a/Resources/Private/Language/zh.locallang.xlf b/Resources/Private/Language/zh.locallang.xlf
index 4f78fba7e1e9955ee0f5c0a293bcc734fa374120..d8eff15c11dcee769b12475f0aaac547f8e9e9d4 100644
--- a/Resources/Private/Language/zh.locallang.xlf
+++ b/Resources/Private/Language/zh.locallang.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" target-language="zh" datatype="plaintext" original="messages" date="2023-09-06T17:30:53Z">
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+	<file source-language="en" target-language="zh" datatype="plaintext" original="EXT:sg_jobs/Resources/Private/Language/locallang.xlf" date="2024-01-18T20:23:37Z">
 		<header>
 			<type>module</type>
 			<description>General language labels used in frontend and backend.</description>
@@ -9,231 +9,231 @@
 			<authorEmail>fabian@sgalinski.de</authorEmail>
 		</header>
 		<body>
-			<trans-unit id="application_mail.marker.birthdate" approved="yes">
+			<trans-unit id="application_mail.marker.birthdate" resname="application_mail.marker.birthdate" approved="yes">
 				<source><![CDATA[Date of birth]]></source>
 				<target><![CDATA[生日]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.city" approved="yes">
+			<trans-unit id="application_mail.marker.city" resname="application_mail.marker.city" approved="yes">
 				<source><![CDATA[City]]></source>
 				<target><![CDATA[地址]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.country" approved="yes">
+			<trans-unit id="application_mail.marker.country" resname="application_mail.marker.country" approved="yes">
 				<source><![CDATA[Country]]></source>
 				<target><![CDATA[国家]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.education" approved="yes">
+			<trans-unit id="application_mail.marker.education" resname="application_mail.marker.education" approved="yes">
 				<source><![CDATA[Education]]></source>
 				<target><![CDATA[最高学历]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.email" approved="yes">
+			<trans-unit id="application_mail.marker.email" resname="application_mail.marker.email" approved="yes">
 				<source><![CDATA[Email]]></source>
 				<target><![CDATA[电子邮件]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.firstname" approved="yes">
+			<trans-unit id="application_mail.marker.firstname" resname="application_mail.marker.firstname" approved="yes">
 				<source><![CDATA[First name]]></source>
 				<target><![CDATA[名]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.gender" approved="yes">
+			<trans-unit id="application_mail.marker.gender" resname="application_mail.marker.gender" approved="yes">
 				<source><![CDATA[Gender]]></source>
 				<target><![CDATA[性别]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.lastname" approved="yes">
+			<trans-unit id="application_mail.marker.lastname" resname="application_mail.marker.lastname" approved="yes">
 				<source><![CDATA[Last name]]></source>
 				<target><![CDATA[姓]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.mobile" approved="yes">
+			<trans-unit id="application_mail.marker.mobile" resname="application_mail.marker.mobile" approved="yes">
 				<source><![CDATA[Mobile]]></source>
 				<target><![CDATA[手机]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.nationality" approved="yes">
+			<trans-unit id="application_mail.marker.nationality" resname="application_mail.marker.nationality" approved="yes">
 				<source><![CDATA[Nationality]]></source>
 				<target><![CDATA[民族]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.phone" approved="yes">
+			<trans-unit id="application_mail.marker.phone" resname="application_mail.marker.phone" approved="yes">
 				<source><![CDATA[Phone]]></source>
 				<target><![CDATA[电话]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.street" approved="yes">
+			<trans-unit id="application_mail.marker.street" resname="application_mail.marker.street" approved="yes">
 				<source><![CDATA[Street]]></source>
 				<target><![CDATA[街道]]></target>
 			</trans-unit>
-			<trans-unit id="application_mail.marker.zip" approved="yes">
+			<trans-unit id="application_mail.marker.zip" resname="application_mail.marker.zip" approved="yes">
 				<source><![CDATA[Zip]]></source>
 				<target><![CDATA[邮编]]></target>
 			</trans-unit>
-			<trans-unit id="error.maxFileSizeMessage" approved="yes">
+			<trans-unit id="error.maxFileSizeMessage" resname="error.maxFileSizeMessage" approved="yes">
 				<source><![CDATA[The selected file exceeds the maximum file size]]></source>
 				<target><![CDATA[The selected file exceeds the maximum file size]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.allVacancies" approved="yes">
+			<trans-unit id="frontend.allVacancies" resname="frontend.allVacancies" approved="yes">
 				<source><![CDATA[All vacancies]]></source>
 				<target><![CDATA[所有职位机会]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.allowed_file_extensions" approved="yes">
+			<trans-unit id="frontend.apply.allowed_file_extensions" resname="frontend.apply.allowed_file_extensions" approved="yes">
 				<source><![CDATA[File types: ]]></source>
 				<target><![CDATA[数据类型]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.birthDate" approved="yes">
+			<trans-unit id="frontend.apply.birthDate" resname="frontend.apply.birthDate" approved="yes">
 				<source><![CDATA[Birth date *]]></source>
 				<target><![CDATA[生日]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.certificate" approved="yes">
+			<trans-unit id="frontend.apply.certificate" resname="frontend.apply.certificate" approved="yes">
 				<source><![CDATA[Certificate *]]></source>
 				<target><![CDATA[证书]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.city" approved="yes">
+			<trans-unit id="frontend.apply.city" resname="frontend.apply.city" approved="yes">
 				<source><![CDATA[City *]]></source>
 				<target><![CDATA[地址]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.company" approved="yes">
+			<trans-unit id="frontend.apply.company" resname="frontend.apply.company" approved="yes">
 				<source><![CDATA[Location *]]></source>
 				<target><![CDATA[地点]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.country" approved="yes">
+			<trans-unit id="frontend.apply.country" resname="frontend.apply.country" approved="yes">
 				<source><![CDATA[Country *]]></source>
 				<target><![CDATA[国家]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.cover_letter" approved="yes">
+			<trans-unit id="frontend.apply.cover_letter" resname="frontend.apply.cover_letter" approved="yes">
 				<source><![CDATA[Cover letter *]]></source>
 				<target><![CDATA[求职信]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.cv" approved="yes">
+			<trans-unit id="frontend.apply.cv" resname="frontend.apply.cv" approved="yes">
 				<source><![CDATA[CV *]]></source>
 				<target><![CDATA[个人简历]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.education" approved="yes">
+			<trans-unit id="frontend.apply.education" resname="frontend.apply.education" approved="yes">
 				<source><![CDATA[Highest achieved education *]]></source>
 				<target><![CDATA[最高学历]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.email" approved="yes">
+			<trans-unit id="frontend.apply.email" resname="frontend.apply.email" approved="yes">
 				<source><![CDATA[Email *]]></source>
 				<target><![CDATA[电子邮件 *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.error.general" approved="yes">
+			<trans-unit id="frontend.apply.error.general" resname="frontend.apply.error.general" approved="yes">
 				<source><![CDATA[An error has occured]]></source>
 				<target><![CDATA[发生错误]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.first_name" approved="yes">
+			<trans-unit id="frontend.apply.first_name" resname="frontend.apply.first_name" approved="yes">
 				<source><![CDATA[First name *]]></source>
 				<target><![CDATA[名 *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.gender" approved="yes">
+			<trans-unit id="frontend.apply.gender" resname="frontend.apply.gender" approved="yes">
 				<source><![CDATA[Gender]]></source>
 				<target><![CDATA[性别]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.gender.female" approved="yes">
+			<trans-unit id="frontend.apply.gender.female" resname="frontend.apply.gender.female" approved="yes">
 				<source><![CDATA[Female]]></source>
 				<target><![CDATA[女]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.gender.male" approved="yes">
+			<trans-unit id="frontend.apply.gender.male" resname="frontend.apply.gender.male" approved="yes">
 				<source><![CDATA[Male]]></source>
 				<target><![CDATA[ç”·]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.last_name" approved="yes">
+			<trans-unit id="frontend.apply.last_name" resname="frontend.apply.last_name" approved="yes">
 				<source><![CDATA[Last name *]]></source>
 				<target><![CDATA[姓 *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.location" approved="yes">
+			<trans-unit id="frontend.apply.location" resname="frontend.apply.location" approved="yes">
 				<source><![CDATA[Location *]]></source>
 				<target><![CDATA[地点 *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.maxFileSize" approved="yes">
+			<trans-unit id="frontend.apply.maxFileSize" resname="frontend.apply.maxFileSize" approved="yes">
 				<source><![CDATA[Maximum file size:]]></source>
 				<target><![CDATA[Maximum file size:]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.message" approved="yes">
+			<trans-unit id="frontend.apply.message" resname="frontend.apply.message" approved="yes">
 				<source><![CDATA[Message]]></source>
 				<target><![CDATA[您的消息]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.mobile" approved="yes">
+			<trans-unit id="frontend.apply.mobile" resname="frontend.apply.mobile" approved="yes">
 				<source><![CDATA[Mobile]]></source>
 				<target><![CDATA[手机]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.nationality" approved="yes">
+			<trans-unit id="frontend.apply.nationality" resname="frontend.apply.nationality" approved="yes">
 				<source><![CDATA[Nationality *]]></source>
 				<target><![CDATA[民族 *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.phone" approved="yes">
+			<trans-unit id="frontend.apply.phone" resname="frontend.apply.phone" approved="yes">
 				<source><![CDATA[Phone *]]></source>
 				<target><![CDATA[电话 *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.street" approved="yes">
+			<trans-unit id="frontend.apply.street" resname="frontend.apply.street" approved="yes">
 				<source><![CDATA[Street *]]></source>
 				<target><![CDATA[街道 *]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.unsolicitedApplication" approved="yes">
+			<trans-unit id="frontend.apply.unsolicitedApplication" resname="frontend.apply.unsolicitedApplication" approved="yes">
 				<source><![CDATA[Unsolicited Application]]></source>
 				<target><![CDATA[在线申请]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.apply.zip" approved="yes">
+			<trans-unit id="frontend.apply.zip" resname="frontend.apply.zip" approved="yes">
 				<source><![CDATA[Zip *]]></source>
 				<target><![CDATA[邮编]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.applyNow" approved="yes">
+			<trans-unit id="frontend.applyNow" resname="frontend.applyNow" approved="yes">
 				<source><![CDATA[Apply online now]]></source>
 				<target><![CDATA[现在就在线申请]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.applyNow.emptyApplication" approved="yes">
+			<trans-unit id="frontend.applyNow.emptyApplication" resname="frontend.applyNow.emptyApplication" approved="yes">
 				<source><![CDATA[Apply to an unlisted position]]></source>
 				<target><![CDATA[在线申请]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.description" approved="yes">
+			<trans-unit id="frontend.description" resname="frontend.description" approved="yes">
 				<source><![CDATA[Description]]></source>
 				<target><![CDATA[描述]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.detail.back" approved="yes">
+			<trans-unit id="frontend.detail.back" resname="frontend.detail.back" approved="yes">
 				<source><![CDATA[Back]]></source>
 				<target><![CDATA[背部]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.detail.header" approved="yes">
+			<trans-unit id="frontend.detail.header" resname="frontend.detail.header" approved="yes">
 				<source><![CDATA[Header]]></source>
 				<target><![CDATA[头]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.entry_date" approved="yes">
+			<trans-unit id="frontend.entry_date" resname="frontend.entry_date" approved="yes">
 				<source><![CDATA[Entry date]]></source>
 				<target><![CDATA[入境时间]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.filter.companies" approved="yes">
+			<trans-unit id="frontend.filter.companies" resname="frontend.filter.companies" approved="yes">
 				<source><![CDATA[Company]]></source>
 				<target><![CDATA[公司]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.filter.countries" approved="yes">
+			<trans-unit id="frontend.filter.countries" resname="frontend.filter.countries" approved="yes">
 				<source><![CDATA[Country]]></source>
 				<target><![CDATA[国家]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.filter.departments" approved="yes">
+			<trans-unit id="frontend.filter.departments" resname="frontend.filter.departments" approved="yes">
 				<source><![CDATA[Departments]]></source>
 				<target><![CDATA[行业]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.filter.experienceLevels" approved="yes">
+			<trans-unit id="frontend.filter.experienceLevels" resname="frontend.filter.experienceLevels" approved="yes">
 				<source><![CDATA[Experience Level]]></source>
 				<target><![CDATA[经验水平]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.filter.locations" approved="yes">
+			<trans-unit id="frontend.filter.locations" resname="frontend.filter.locations" approved="yes">
 				<source><![CDATA[Location]]></source>
 				<target><![CDATA[地点]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.filter.remote" approved="yes">
+			<trans-unit id="frontend.filter.remote" resname="frontend.filter.remote" approved="yes">
 				<source><![CDATA[Show fully remote jobs only]]></source>
 				<target><![CDATA[Show fully remote jobs only]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.filter.selections.all" approved="yes">
+			<trans-unit id="frontend.filter.selections.all" resname="frontend.filter.selections.all" approved="yes">
 				<source><![CDATA[All]]></source>
 				<target><![CDATA[All]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.location" approved="yes">
+			<trans-unit id="frontend.location" resname="frontend.location" approved="yes">
 				<source><![CDATA[Location]]></source>
 				<target><![CDATA[地点]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.qualification" approved="yes">
+			<trans-unit id="frontend.qualification" resname="frontend.qualification" approved="yes">
 				<source><![CDATA[Qualification]]></source>
 				<target><![CDATA[合格]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.task" approved="yes">
+			<trans-unit id="frontend.task" resname="frontend.task" approved="yes">
 				<source><![CDATA[Task]]></source>
 				<target><![CDATA[任务]]></target>
 			</trans-unit>
-			<trans-unit id="frontend.teaserHeadline" approved="yes">
+			<trans-unit id="frontend.teaserHeadline" resname="frontend.teaserHeadline" approved="yes">
 				<source><![CDATA[Vacancies worldwide]]></source>
 				<target><![CDATA[全球职位机会]]></target>
 			</trans-unit>
diff --git a/Resources/Private/Partials/Job.html b/Resources/Private/Partials/Job.html
index 2d6aad9eb086d96bb649402363865b13e0a67a44..1dd69361850a4db3695bcb424f8605a22282f336 100644
--- a/Resources/Private/Partials/Job.html
+++ b/Resources/Private/Partials/Job.html
@@ -28,7 +28,7 @@
 							</f:if>
 						</li>
 						<li>
-							<f:for each="{job.companies}" as="company" iteration="iterator">
+							<f:for each="{job.company}" as="company" iteration="iterator">
 								{company.city}{f:if(condition: '!{iterator.isLast} || {iterator.isLast} && {job.telecommutePossible} ', then: ', ')}
 							</f:for>
 							<f:if condition="{job.telecommutePossible}">
diff --git a/Resources/Private/Templates/Backend/Index.html b/Resources/Private/Templates/Backend/Index.html
index b2f26076200995e6212db005bbb6a13e7754d814..03f386983edcf64a514ab518deeb73ac58caf541 100644
--- a/Resources/Private/Templates/Backend/Index.html
+++ b/Resources/Private/Templates/Backend/Index.html
@@ -46,7 +46,7 @@
 											</td>
 											<td>
 												<be:link.editRecord uid="{job.uid}" table="tx_sgjobs_domain_model_job">
-													<span>{job.title} - <sg:backend.companyLabel uid="{job.uid}" companyraw="{job.firstCompany}"></sg:backend.companyLabel> </span>
+													<span>{job.title} - <sg:backend.companyLabel uid="{job.uid}" companyraw="{job.company}"></sg:backend.companyLabel> </span>
 												</be:link.editRecord>
 											</td>
 											<td nowrap="nowrap" class="col-control">
diff --git a/Resources/Private/Templates/PageBrowser/Index.html b/Resources/Private/Templates/PageBrowser/Index.html
index 1b673790b98f48b7e8da1617ba4cce97037d465a..02deae38c8440bb4a4eb4ecbfe5be246ebe56daa 100644
--- a/Resources/Private/Templates/PageBrowser/Index.html
+++ b/Resources/Private/Templates/PageBrowser/Index.html
@@ -10,31 +10,45 @@
 					<f:then>
 						<li class="tx-pagebrowse-prev">
 							<f:variable name="prevPage" value="{currentPage - 1}"/>
-							<f:link.action addQueryString="1"
-										   additionalParams="{tx_sgjobs_pagebrowser: {currentPage: prevPage}}"
-										   additionalAttributes="{aria-label: 'Previous'}">
-								&laquo;
-							</f:link.action>
+							<f:if condition="{prevPage} == 0">
+								<f:then>
+									<f:link.action addQueryString="untrusted"
+												   argumentsToBeExcludedFromQueryString="{0: 'tx_sgjobs_pagebrowser'}"
+												   additionalAttributes="{aria-label: 'Previous'}">
+										&laquo;
+									</f:link.action>
+								</f:then>
+								<f:else>
+									<f:link.action addQueryString="untrusted"
+												   argumentsToBeExcludedFromQueryString="{0: 'tx_sgjobs_pagebrowser'}"
+												   additionalParams="{tx_sgjobs_pagebrowser: {currentPage: prevPage}}"
+												   additionalAttributes="{aria-label: 'Previous'}">
+										&laquo;
+									</f:link.action>
+								</f:else>
+							</f:if>
 						</li>
 					</f:then>
-					<f:else>
-						<li class="tx-pagebrowse-prev disabled">
-							<a aria-label="Previous">
-								<span aria-hidden="true">
-									&laquo;
-								</span>
-							</a>
-						</li>
-					</f:else>
 				</f:if>
 
 				<f:if condition="{enableLessPages} && {showLessPages}">
 					<li>
 						<f:variable name="lessPage" value="{currentPage - 2}"/>
-						<f:link.action addQueryString="1"
-									   additionalParams="{tx_sgjobs_pagebrowser: {currentPage: lessPage}}">
-							...
-						</f:link.action>
+						<f:if condition="{lessPage} == 0">
+							<f:then>
+								<f:link.action addQueryString="untrusted"
+											   argumentsToBeExcludedFromQueryString="{0: 'tx_sgjobs_pagebrowser'}">
+									...
+								</f:link.action>
+							</f:then>
+							<f:else>
+								<f:link.action addQueryString="untrusted"
+											   argumentsToBeExcludedFromQueryString="{0: 'tx_sgjobs_pagebrowser'}"
+											   additionalParams="{tx_sgjobs_pagebrowser: {currentPage: lessPage}}">
+									...
+								</f:link.action>
+							</f:else>
+						</f:if>
 					</li>
 				</f:if>
 
@@ -52,10 +66,21 @@
 						</f:then>
 						<f:else>
 							<li class="tx-pagebrowse-page">
-								<f:link.action addQueryString="1"
-											   additionalParams="{tx_sgjobs_pagebrowser: {currentPage: pageLink.page}}">
-									{pageLink.number}
-								</f:link.action>
+								<f:if condition="{pageLink.page} == 0">
+									<f:then>
+										<f:link.action addQueryString="untrusted"
+													   argumentsToBeExcludedFromQueryString="{0: 'tx_sgjobs_pagebrowser'}">
+											{pageLink.number}
+										</f:link.action>
+									</f:then>
+									<f:else>
+										<f:link.action addQueryString="untrusted"
+													   argumentsToBeExcludedFromQueryString="{0: 'tx_sgjobs_pagebrowser'}"
+													   additionalParams="{tx_sgjobs_pagebrowser: {currentPage: pageLink.page}}">
+											{pageLink.number}
+										</f:link.action>
+									</f:else>
+								</f:if>
 							</li>
 						</f:else>
 					</f:if>
@@ -64,7 +89,8 @@
 				<f:if condition="{enableMorePages} && {showNextPages}">
 					<li>
 						<f:variable name="morePage" value="{currentPage + 2}"/>
-						<f:link.action addQueryString="1"
+						<f:link.action addQueryString="untrusted"
+									   argumentsToBeExcludedFromQueryString="{0: 'tx_sgjobs_pagebrowser'}"
 									   additionalParams="{tx_sgjobs_pagebrowser: {currentPage: morePage}}">
 							...
 						</f:link.action>
@@ -75,22 +101,14 @@
 					<f:then>
 						<li class="tx-pagebrowse-next">
 							<f:variable name="nextPage" value="{currentPage + 1}"/>
-							<f:link.action addQueryString="1"
+							<f:link.action addQueryString="untrusted"
+										   argumentsToBeExcludedFromQueryString="{0: 'tx_sgjobs_pagebrowser'}"
 										   additionalParams="{tx_sgjobs_pagebrowser: {currentPage: nextPage}}"
 										   additionalAttributes="{aria-label: 'Next'}">
 								&raquo;
 							</f:link.action>
 						</li>
 					</f:then>
-					<f:else>
-						<li class="tx-pagebrowse-next disabled">
-							<a aria-label="Next">
-								<span aria-hidden="true">
-									&raquo;
-								</span>
-							</a>
-						</li>
-					</f:else>
 				</f:if>
 			</ul>
 		</nav>
diff --git a/composer.json b/composer.json
index a79f8c8ebc2f1dc96db3af8d7c8fa977c3b8ec3a..07ba1339790c0966f04405b07bce861550fb23b4 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
 	"license": [
 		"GPL-2.0-or-later"
 	],
-	"version": "5.7.4",
+	"version": "6.0.0",
 	"support": {
 		"issues": "https://gitlab.sgalinski.de/typo3/sg_jobs"
 	},
diff --git a/ext_emconf.php b/ext_emconf.php
index 76a64a921ef942644ac0509ea172df5ad51fd4c5..c55ccaa97929bd53f65f3e69720359db14638654 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -4,7 +4,7 @@ $EM_CONF['sg_jobs'] = [
 	'title' => 'Jobs',
 	'description' => 'Manage and display your Job offers.',
 	'category' => 'plugin',
-	'version' => '5.7.4',
+	'version' => '6.0.0',
 	'state' => 'stable',
 	'author' => 'Stefan Galinski',
 	'author_email' => 'stefan@sgalinski.de',