diff --git a/Classes/Domain/Repository/JobRepository.php b/Classes/Domain/Repository/JobRepository.php
index 4955e0e9e9f5dc1043e4b818d6a0f818b6ff56f9..343a891fdc1871c2679f698b9fb70a934cdbcf16 100644
--- a/Classes/Domain/Repository/JobRepository.php
+++ b/Classes/Domain/Repository/JobRepository.php
@@ -173,9 +173,12 @@ class JobRepository extends Repository {
 		$query = $this->createQuery();
 		$storagePageIds = $query->getQuerySettings()->getStoragePageIds();
 
-		// we always show all jobs (translated or only created in the specific language)
+		// we always want to show all jobs if the strict mode is used (translated or
+		// created in the specific language w/o default)
 		$querySettings = $query->getQuerySettings();
-		$querySettings->setLanguageOverlayMode(FALSE);
+		if ($querySettings->getLanguageOverlayMode() === 'hideNonTranslated') {
+			$querySettings->setLanguageOverlayMode(FALSE);
+		}
 		$query->setQuerySettings($querySettings);
 
 		if (empty($storagePageIds)) {
diff --git a/ext_localconf.php b/ext_localconf.php
index d4868603b8916a3c8c2cc060a7de15d8baa3b4da..a3747989bc57497c8f993cecef57088b81e2af5f 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -1,6 +1,7 @@
 <?php
 
 defined('TYPO3') or die();
+
 /***************************************************************
  *  Copyright notice
  *
@@ -39,7 +40,7 @@ call_user_func(
 				\SGalinski\SgJobs\Controller\JoblistController::class => 'index'
 			],
 			[
-				// Uncacheable actions
+				// Non-Cache actions
 				\SGalinski\SgJobs\Controller\JoblistController::class => 'index'
 			]
 		);
@@ -51,7 +52,7 @@ call_user_func(
 				\SGalinski\SgJobs\Controller\JoblistController::class => 'applyForm, apply, empty'
 			],
 			[
-				// Uncacheable actions
+				// Non-Cache actions
 				\SGalinski\SgJobs\Controller\JoblistController::class => 'applyForm, apply, empty'
 			]
 		);
@@ -63,7 +64,7 @@ call_user_func(
 				\SGalinski\SgJobs\Controller\JobTeaserController::class => 'index'
 			],
 			[
-				// Uncacheable actions
+				// Non-Cache actions
 				\SGalinski\SgJobs\Controller\JobTeaserController::class => ''
 			]
 		);
@@ -90,7 +91,6 @@ call_user_func(
 		// register mail templates
 		$GLOBALS['sg_mail']['sg_jobs']['ApplicationMail'] = 'EXT:sg_jobs/Configuration/SgMail/ApplicationMail.php';
 
-
 		// Register the upgrade wizard
 		$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update'][\SGalinski\SgJobs\Updates\DepartmentUpdateWizard::IDENTIFIER]
 			= \SGalinski\SgJobs\Updates\DepartmentUpdateWizard::class;