diff --git a/Classes/Controller/AbstractController.php b/Classes/Controller/AbstractController.php
index f4b243b4272507547f6609d2fe33b30f19962d1f..345443d3661ff6ae41b44c302bdf2fc2b33b61e4 100644
--- a/Classes/Controller/AbstractController.php
+++ b/Classes/Controller/AbstractController.php
@@ -30,6 +30,7 @@ use RuntimeException;
 use SGalinski\SgNews\Domain\Model\Category;
 use SGalinski\SgNews\Domain\Model\News;
 use SGalinski\SgNews\Service\ImageService;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Domain\Model\FileReference;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 
@@ -95,6 +96,9 @@ abstract class AbstractController extends ActionController {
 			return $this->cachedSingleNews[$newsId];
 		}
 
+		$fileRepository = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\FileRepository::class);
+		$fileObjects = $fileRepository->findByRelation('pages', 'media', $news->getUid());
+
 		$singleNewsImageData = $this->getDataForSingleViewImage($news, $category);
 		$teaserImageData = $this->getDataForTeaserImage($news, $category);
 
@@ -114,7 +118,8 @@ abstract class AbstractController extends ActionController {
 				'news' => $news,
 			],
 			$singleNewsImageData,
-			$teaserImageData
+			$teaserImageData,
+			['media' => $fileObjects]
 		);
 
 		$this->cachedSingleNews[$newsId] = $newsRecord;
diff --git a/Classes/Controller/OverviewController.php b/Classes/Controller/OverviewController.php
index f7d0e5285d2132376d7e39a56f4d6fd9de6edf16..a03e3dc3f375faa1016c11c32b61c34fca951c3b 100644
--- a/Classes/Controller/OverviewController.php
+++ b/Classes/Controller/OverviewController.php
@@ -355,6 +355,9 @@ class OverviewController extends AbstractController {
 		if (isset($newsFilter['tag']) && $newsFilter['tag']) {
 			$tagIds = [(int) $newsFilter['tag']];
 		}
+		if ($newsFilter['category']) {
+			$categoryIds = [(int) $newsFilter['category']];
+		}
 		$news = $this->newsRepository->findAllSortedNewsByCategories(
 			$categoryIds,
 			$newsLimitPerCategory,
@@ -407,6 +410,11 @@ class OverviewController extends AbstractController {
 		if (isset($newsFilter['tag'])) {
 			$selectedTag = $this->tagRepository->findByUid((int) $newsFilter['tag']);
 		}
+		$selectedCategory = NULL;
+		if(isset($newsFilter['category'])) {
+			$selectedCategory = $this->categoryRepository->findByUid((int) $newsFilter['category']);
+		}
+		$this->view->assign('selectedCategory', $selectedCategory);
 		$this->view->assign('selectedTag', $selectedTag);
 		$this->view->assign('tags', $tags);
 		$this->view->assign('categories', $categories);
@@ -534,6 +542,9 @@ class OverviewController extends AbstractController {
 		}
 
 		// Get all news by tags.
+		if ($newsFilter['tag']) {
+			$tagIds = [(int) $newsFilter['tag']];
+		}
 		$news = $this->newsRepository->findAllSortedNewsByCategories(
 			$categoryIds,
 			$newsLimitPerTag,
@@ -583,8 +594,10 @@ class OverviewController extends AbstractController {
 		}
 
 		// remember selection of the filter values, if any
+		$selectedTag = $this->tagRepository->findByUid((int) $newsFilter['tag']);
 		$selectedCategory = $this->categoryRepository->findByUid((int) $newsFilter['category']);
 		$this->view->assign('selectedCategory', $selectedCategory);
+		$this->view->assign('selectedTag', $selectedTag);
 		$this->view->assign('tags', $tags);
 		$this->view->assign('categories', $categories);
 		$this->view->assign('numberOfPages', $numberOfPages);
diff --git a/Configuration/FlexForms/Overview.xml b/Configuration/FlexForms/Overview.xml
index e41b3c61dc9d0aa052c86ec86d78cb891a5352e5..3825dd256d5b310f69bfbeceb8fabfa9cf9b3fa3 100644
--- a/Configuration/FlexForms/Overview.xml
+++ b/Configuration/FlexForms/Overview.xml
@@ -80,12 +80,29 @@
 					<settings.enableFilter>
 						<TCEforms>
 							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.overview.flexForm.enableFilter</label>
+							<description>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.overview.flexForm.enableFilter.description</description>
 							<config>
 								<type>check</type>
 								<default>0</default>
 							</config>
 						</TCEforms>
 					</settings.enableFilter>
+					<settings.categoryLabel>
+						<TCEforms>
+							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.overview.flexForm.categoryLabel</label>
+							<config>
+								<type>input</type>
+							</config>
+						</TCEforms>
+					</settings.categoryLabel>
+					<settings.tagLabel>
+						<TCEforms>
+							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.overview.flexForm.tagLabel</label>
+							<config>
+								<type>input</type>
+							</config>
+						</TCEforms>
+					</settings.tagLabel>
 					<settings.newsLimit>
 						<TCEforms>
 							<label>LLL:EXT:sg_news/Resources/Private/Language/locallang_db.xlf:plugin.overview.flexForm.newsLimit</label>
diff --git a/Configuration/TCA/Overrides/pages.php b/Configuration/TCA/Overrides/pages.php
index 2febe1b8c751b6f26ceeb29936e9681c97ff83d0..5a0f60d4c0a0138971216c3faaa831a5ba2ffad1 100644
--- a/Configuration/TCA/Overrides/pages.php
+++ b/Configuration/TCA/Overrides/pages.php
@@ -133,7 +133,7 @@ if (version_compare(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getExten
 			--palette--;;media,
 		--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.tabs.metadata,
 			--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.palettes.abstract;abstract,
-			seo_title,canonical_link, ' . (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('yoast_seo') ? '':'description,') . '
+			seo_title,canonical_link, ' . (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('yoast_seo') || \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('seo') ? '':'description,') . '
 		--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.tabs.appearance,
 			--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.palettes.layout;layout,
 		--div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
@@ -157,7 +157,7 @@ if (version_compare(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getExten
 		--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.tabs.metadata,
 			tx_projectbase_devnullrobots_flags,
 			--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.palettes.abstract;abstract,
-			tx_projectbase_seo_titletag,tx_projectbase_seo_canonicaltag, ' . (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('yoast_seo') ? '':'description,') . '
+			tx_projectbase_seo_titletag,tx_projectbase_seo_canonicaltag, ' . (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('yoast_seo') || \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('seo') ? '':'description,') . '
 		--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.tabs.appearance,
 			--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.palettes.layout;layout,
 		--div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
@@ -456,7 +456,7 @@ if (version_compare(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getExten
 $GLOBALS['TCA']['pages']['palettes']['titleDescriptionAndHighlightFlag'] = [
 	'showitem' => 'subtitle;' . $localLangDbPath . 'pages.subtitle.inPalette,
 	--linebreak--, title,
-	' . (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('yoast_seo') ? '':'--linebreak--, description,') . '
+	' . (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('yoast_seo') || \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('seo') ? '':'--linebreak--, description,') . '
 	--linebreak--, slug,
 	--linebreak--, tx_projectbase_path_segment, tx_projectbase_excludefromsluggeneration,
 	--linebreak--, tx_realurl_pathsegment, tx_realurl_exclude,
diff --git a/Resources/Private/Language/de.locallang_db.xlf b/Resources/Private/Language/de.locallang_db.xlf
index 26620a5827670dbbd35b337cce312a627d370ecd..a2d5f49d314880b118eca77799f3d33e8e92dcdc 100644
--- a/Resources/Private/Language/de.locallang_db.xlf
+++ b/Resources/Private/Language/de.locallang_db.xlf
@@ -142,8 +142,8 @@
 				<target><![CDATA[News Autor]]></target>
 			</trans-unit>
 			<trans-unit id="plugin.flexForm.orderInPageTree" approved="yes">
-				<source><![CDATA[Order in pagetree]]></source>
-				<target><![CDATA[Reihenfolge im Seitenbaum]]></target>
+				<source><![CDATA[Order in pagetree (Only one category allowed)]]></source>
+				<target><![CDATA[Reihenfolge im Seitenbaum (Nur eine Kategorie erlaubt)]]></target>
 			</trans-unit>
 			<trans-unit id="plugin.flexForm.showDetails" approved="yes">
 				<source><![CDATA[Show the information of the author.]]></source>
@@ -189,6 +189,14 @@
 				<source><![CDATA[Categories]]></source>
 				<target><![CDATA[Kategorien]]></target>
 			</trans-unit>
+			<trans-unit id="plugin.overview.flexForm.categoryLabel" approved="yes">
+				<source><![CDATA[Override category label]]></source>
+				<target><![CDATA[Kategorie-Label überschreiben]]></target>
+			</trans-unit>
+			<trans-unit id="plugin.overview.flexForm.tagLabel" approved="yes">
+				<source><![CDATA[Override tag label]]></source>
+				<target><![CDATA[Tag-Label überschreiben]]></target>
+			</trans-unit>
 			<trans-unit id="plugin.listByCategory.flexForm.categories.description" approved="yes">
 				<source><![CDATA[If more than one category is selected the pagination breaks so you need to make sure to set the news limit high enough to display all news on one page.]]></source>
 				<target><![CDATA[Falls mehr als eine Kategorie ausgewählt ist, bricht die Paginierung, deshalb muss sichergestellt werden, dass das Anzeigelimit ausreichend hoch eingestellt ist, dass alle News auf einer Seite angezeigt werden.]]></target>
@@ -212,8 +220,12 @@ If none are selected, all categories will be available in the frontend.]]></sour
 Wenn keine ausgewählt werden, sind alle Kategorien im Frontend verfügbar.]]></target>
 			</trans-unit>
 			<trans-unit id="plugin.overview.flexForm.enableFilter" approved="yes">
-				<source><![CDATA[Enable filtering by criteria that are not grouped in tabs]]></source>
-				<target><![CDATA[Filtern nach Kriterien, die nicht in Tabs sortiert sind, ermöglichen]]></target>
+				<source><![CDATA[Enable filtering by all criteria.]]></source>
+				<target><![CDATA[Ermögliche das Filtern mit allen Krierien.]]></target>
+			</trans-unit>
+			<trans-unit id="plugin.overview.flexForm.enableFilter.description" approved="yes">
+				<source><![CDATA[Filters will be rendered as select boxes and tabs will be hidden.]]></source>
+				<target><![CDATA[Filter werden als Dropdown-Box angezeigt und die Tabs ausgeblendet.]]></target>
 			</trans-unit>
 			<trans-unit id="plugin.overview.flexForm.groupBy" approved="yes">
 				<source><![CDATA[Group news pages in tabs by]]></source>
diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf
index 61360d4b7daedbc1e7a800123d8f99d8acba297d..cc259e90a064d8df03944dd502232d342da356e6 100644
--- a/Resources/Private/Language/locallang_db.xlf
+++ b/Resources/Private/Language/locallang_db.xlf
@@ -109,7 +109,7 @@
 				<source><![CDATA[News Author]]></source>
 			</trans-unit>
 			<trans-unit id="plugin.flexForm.orderInPageTree">
-				<source><![CDATA[Order in pagetree]]></source>
+				<source><![CDATA[Order in pagetree (Only one category allowed)]]></source>
 			</trans-unit>
 			<trans-unit id="plugin.flexForm.showDetails">
 				<source><![CDATA[Show the information of the author.]]></source>
@@ -156,12 +156,21 @@
 			<trans-unit id="plugin.overview.flexForm.categoryRestrictions">
 				<source><![CDATA[Category Selection]]></source>
 			</trans-unit>
+			<trans-unit id="plugin.overview.flexForm.categoryLabel">
+				<source><![CDATA[Override category label]]></source>
+			</trans-unit>
+			<trans-unit id="plugin.overview.flexForm.tagLabel">
+				<source><![CDATA[Override tag label]]></source>
+			</trans-unit>
 			<trans-unit id="plugin.overview.flexForm.categoryRestrictions.description">
 				<source><![CDATA[You can select specific categories to be shown in the tabs.
 If none are selected, all categories will be available in the frontend.]]></source>
 			</trans-unit>
 			<trans-unit id="plugin.overview.flexForm.enableFilter">
-				<source><![CDATA[Enable filtering by criteria that are not grouped in tabs]]></source>
+				<source><![CDATA[Enable filtering by all criteria.]]></source>
+			</trans-unit>
+			<trans-unit id="plugin.overview.flexForm.enableFilter.description">
+				<source><![CDATA[Filters will be rendered as select boxes and tabs will be hidden.]]></source>
 			</trans-unit>
 			<trans-unit id="plugin.overview.flexForm.groupBy">
 				<source><![CDATA[Group news pages in tabs by]]></source>
diff --git a/Resources/Private/Partials/Filter.html b/Resources/Private/Partials/Filter.html
index cf6dda5dba7d40f1b294f0efe65a277e62b1e51a..2f10d24df125349c8a6426bb3c97d9f21e50ae60 100644
--- a/Resources/Private/Partials/Filter.html
+++ b/Resources/Private/Partials/Filter.html
@@ -1,24 +1,16 @@
 <f:form id="tx-sgnews-filter" method="get" objectName="newsFilter">
 	<div class="tx-sgnews-filter-bar">
-		<f:if condition="!{categoryTabs}">
-			<div class="tx-sgnews-filter-bar-form-control">
-				<label for="filter-categories">
-					<f:translate key="frontend.filter.category" />
-				</label>
-				<f:form.select class="tx-sgnews-select form-control" multiple="0" size="1" value="{selectedCategory.uid}"
-					property="category" optionLabelField="title" optionValueField="uid" options="{categories}"
-					id="filter-categories" prependOptionLabel="" prependOptionValue="" />
-			</div>
-		</f:if>
-		<f:if condition="!{tagTabs}">
-			<div class="tx-sgnews-filter-bar-form-control">
-				<label for="filter-tags">
-					<f:translate key="frontend.filter.tag" />
-				</label>
-				<f:form.select class="tx-sgnews-select form-control" multiple="0" size="1" value="{selectedTag.uid}"
-					property="tag" optionValueField="uid" options="{tags}" id="filter-tags"
-					optionLabelField="title" prependOptionLabel="" prependOptionValue="" />
-			</div>
-		</f:if>
+		<div class="tx-sgnews-filter-bar-form-control">
+			<f:form.select class="tx-sgnews-select form-control" multiple="0" size="1" value="{selectedCategory.uid}"
+						   property="category" optionLabelField="title" optionValueField="uid" options="{categories}"
+						   id="filter-categories" prependOptionValue=""
+						   prependOptionLabel="{f:if(condition: '{categoryLabel}', then: '{categoryLabel}', else: '{f:translate(key: \'frontend.filter.category\')}')}" />
+		</div>
+		<div class="tx-sgnews-filter-bar-form-control">
+			<f:form.select class="tx-sgnews-select form-control" multiple="0" size="1" value="{selectedTag.uid}"
+						   property="tag" optionValueField="uid" options="{tags}" id="filter-tags"
+						   optionLabelField="title" prependOptionValue=""
+						   prependOptionLabel="{f:if(condition: '{tagLabel}', then: '{tagLabel}', else: '{f:translate(key: \'frontend.filter.tag\')}')}"/>
+		</div>
 	</div>
 </f:form>
diff --git a/Resources/Private/Templates/Overview/Overview.html b/Resources/Private/Templates/Overview/Overview.html
index 0b0b056e89ddb2f74204c2776f30e1f79054675c..6735798bce05105076c454a3543a11d0c6e626cc 100644
--- a/Resources/Private/Templates/Overview/Overview.html
+++ b/Resources/Private/Templates/Overview/Overview.html
@@ -7,83 +7,92 @@
 	<f:render partial="OverviewSchema" arguments="{newsItems: allNews}" />
 
 	<f:if condition="{settings.enableFilter}">
-		<div id="tx-sgnews-newslist">
-			<f:render partial="Filter" arguments="{tagTabs: tagTabs, categoryTabs: categoryTabs, categories: categories,
-					tags: tags, selectedTag: selectedTag, selectedCategory: selectedCategory}" />
-		</div>
-	</f:if>
-	<br />
-	<div class="tx-sgnews-categories m-tabs" data-more-label="Mehr">
-		<div class="m-tabs__tablist" role="tablist">
-			<button class="m-tabs__tab" role="tab" aria-controls="news-category-0" id="tab-news-0" aria-selected="true">
-				<f:translate key="frontend.overview.allTabLabel" />
-			</button>
-			<f:for each="{newsItems}" as="dataItems" iteration="iterator">
-				<button class="m-tabs__tab" role="tab" aria-controls="news-category-{iterator.index + 1}" id="tab-news-{iterator.index + 1}" aria-selected="false">
-					<f:if condition="{dataItems.recordType} == 'category'">
-						<f:then>
-							{dataItems.record.subtitleWithFallbackToTitle}
-						</f:then>
-						<f:else>
-							{dataItems.record.title}
-						</f:else>
-					</f:if>
-				</button>
-			</f:for>
-		</div>
-
-		<div class="m-tabs__panellist">
-			<div class="m-tabs__panel" role="tabpanel" aria-labelledby="tab-news-0" id="news-category-0">
-				<h4 class="tx-sgnews-tab-title"><f:translate key="frontend.overview.allTabLabel" /></h4>
-				<ul class="tx-sgnews-list tx-sgnews-list-0 row" data-record="0">
-					<f:for each="{allNews}" as="newsMetaDataEntry">
-						<li class="col-md-4 col-sm-6 col-xs-12">
-							<f:render partial="Teaser" arguments="{
-								newsMetaData: newsMetaDataEntry,
-								headerTag: '<h2>',
-								closingHeaderTag: '</h2>',
-								showCategory: '{f:if(condition: \'{groupBy} == \" category\"\', then: 0, else: 1)}'
-							}" />
-						</li>
-					</f:for>
-				</ul>
+		<f:then>
+			<div id="tx-sgnews-newslist" class="tx-sgnews-categories">
+				<f:render partial="Filter" arguments="{tagTabs: tagTabs, categoryTabs: categoryTabs, categories: categories,
+					tags: tags, selectedTag: selectedTag, selectedCategory: selectedCategory, categoryLabel: settings.categoryLabel, tagLabel: settings.tagLabel}" />
+				<f:render section="content" arguments="{_all}" />
 			</div>
+		</f:then>
+		<f:else>
+			<div class="tx-sgnews-categories m-tabs" data-more-label="Mehr">
+				<div class="m-tabs__tablist" role="tablist">
+					<button class="m-tabs__tab" role="tab" aria-controls="news-category-0" id="tab-news-0" aria-selected="true">
+						<f:translate key="frontend.overview.allTabLabel" />
+					</button>
+					<f:for each="{newsItems}" as="dataItems" iteration="iterator">
+						<button class="m-tabs__tab" role="tab" aria-controls="news-category-{iterator.index + 1}" id="tab-news-{iterator.index + 1}" aria-selected="false">
+							<f:if condition="{dataItems.recordType} == 'category'">
+								<f:then>
+									{dataItems.record.subtitleWithFallbackToTitle}
+								</f:then>
+								<f:else>
+									{dataItems.record.title}
+								</f:else>
+							</f:if>
+						</button>
+					</f:for>
+				</div>
+
+				<div class="m-tabs__panellist">
+					<div class="m-tabs__panel" role="tabpanel" aria-labelledby="tab-news-0" id="news-category-0">
+						<h4 class="tx-sgnews-tab-title"><f:translate key="frontend.overview.allTabLabel" /></h4>
+						<f:render section="content" arguments="{_all}" />
+					</div>
 
-			<f:for each="{newsItems}" as="dataItems" iteration="iterator">
-				<div class="m-tabs__panel m-tabs__panel--closed" role="tabpanel" aria-labelledby="tab-news-{iterator.index + 1}" id="news-category-{iterator.index + 1}">
-					<f:if condition="{dataItems.newsCount} == 0">
-						<p>
-							<f:translate key="frontend.filter.no_result" />
-						</p>
-					</f:if>
-					<h4 class="tx-sgnews-tab-title">{dataItems.record.title}</h4>
-					<ul class="tx-sgnews-list tx-sgnews-list-{dataItems.record.uid} row" data-record="{dataItems.record.uid}">
-						<f:for each="{dataItems.newsMetaData}" as="newsMetaDataEntry">
-							<f:if condition="{newsMetaDataEntry.news}">
-								<li class="col-md-4 col-sm-6 col-xs-12">
-										<f:render partial="Teaser" arguments="{
+					<f:for each="{newsItems}" as="dataItems" iteration="iterator">
+						<div class="m-tabs__panel m-tabs__panel--closed" role="tabpanel" aria-labelledby="tab-news-{iterator.index + 1}" id="news-category-{iterator.index + 1}">
+							<f:if condition="{dataItems.newsCount} == 0">
+								<p>
+									<f:translate key="frontend.filter.no_result" />
+								</p>
+							</f:if>
+							<h4 class="tx-sgnews-tab-title">{dataItems.record.title}</h4>
+							<ul class="tx-sgnews-list tx-sgnews-list-{dataItems.record.uid} row" data-record="{dataItems.record.uid}">
+								<f:for each="{dataItems.newsMetaData}" as="newsMetaDataEntry">
+									<f:if condition="{newsMetaDataEntry.news}">
+										<li class="col-md-4 col-sm-6 col-xs-12">
+											<f:render partial="Teaser" arguments="{
 											newsMetaData: newsMetaDataEntry,
 											headerTag: '<h2>',
 											closingHeaderTag: '</h2>',
 											showCategory: '{f:if(condition: \'{groupBy} == \" category\"\', then: 0, else: 1)}'
-									}" />
-								</li>
+											}" />
+										</li>
+									</f:if>
+								</f:for>
+							</ul>
+
+							<f:if condition="{dataItems.recordType} == 'category'">
+								<div class="text-center">
+									<a class="btn btn-md btn-success category-{dataItems.recordId}" href="{f:uri.page(pageUid: '{dataItems.recordId}')}">
+										<f:translate key="frontend.overview.showAllEntries" />
+									</a>
+								</div>
 							</f:if>
-						</f:for>
-					</ul>
 
-					<f:if condition="{dataItems.recordType} == 'category'">
-						<div class="text-center">
-							<a class="btn btn-md btn-success category-{dataItems.recordId}" href="{f:uri.page(pageUid: '{dataItems.recordId}')}">
-								<f:translate key="frontend.overview.showAllEntries" />
-							</a>
 						</div>
-					</f:if>
-
+					</f:for>
 				</div>
-			</f:for>
-		</div>
 
-	</div>
+			</div>
+		</f:else>
+	</f:if>
+
 	<sg:pageBrowser numberOfPages="{numberOfPages}" />
 </f:section>
+
+<f:section name="content">
+	<ul class="tx-sgnews-list tx-sgnews-list-0 row" data-record="0">
+		<f:for each="{allNews}" as="newsMetaDataEntry">
+			<li class="col-md-4 col-sm-6 col-xs-12">
+				<f:render partial="Teaser" arguments="{
+								newsMetaData: newsMetaDataEntry,
+								headerTag: '<h2>',
+								closingHeaderTag: '</h2>',
+								showCategory: '{f:if(condition: \'{groupBy} == \" category\"\', then: 0, else: 1)}'
+				}" />
+			</li>
+		</f:for>
+	</ul>
+</f:section>
diff --git a/Resources/Public/JavaScript/ScrollBrowser.js b/Resources/Public/JavaScript/ScrollBrowser.js
index ae7c001d1e0271f06618eaf6f5adb3da97a3e341..02c45211dbded6d9a30814dee3bd33fad12b20fe 100644
--- a/Resources/Public/JavaScript/ScrollBrowser.js
+++ b/Resources/Public/JavaScript/ScrollBrowser.js
@@ -85,6 +85,12 @@ export default class ScrollBrowser {
 		this.lastUrl = this.url;
 		this.url = doc.querySelector('.tx-pagebrowse-next a').getAttribute('href');
 		this.lock = false;
+
+		const displayNewDataEvent = new CustomEvent('sg_news:displayNewData', {
+			detail: results
+		});
+
+		document.dispatchEvent(displayNewDataEvent);
 	}
 
 	/**
diff --git a/Upgrade.md b/Upgrade.md
index 07044b55e93c85c4cb52a3fba908418f63d5dc98..54cd3abbafc8c549107d6d42d9ece052de76638d 100644
--- a/Upgrade.md
+++ b/Upgrade.md
@@ -2,6 +2,10 @@
 
 - Dropped TYPO3 9 support
 
+## Upgrade from ```9.5.x``` to ```9.6.x```
+
+- Filters are now visible when using the option ```settings.enableFilter``` in the **Overview** plugin.
+
 # Upgrade from ```8.x.x``` to ```9.x.x```
 
 - Dropped TYPO3 8 support
diff --git a/composer.json b/composer.json
index b734530c14c53b74409b9264ca2d65f9835c9588..be7a715926154138e4c318990a6f41f42738279c 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
     "license": [
         "GPL-2.0-or-later"
     ],
-    "version": "9.5.4",
+    "version": "9.6.3",
     "support": {
     },
     "repositories": [
diff --git a/ext_emconf.php b/ext_emconf.php
index dca98487ac158281b20249cbd1d69cf36600802a..c50566f6a4cd7035a8942ba88313927dce7fe4b1 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -19,7 +19,7 @@ $EM_CONF['sg_news'] = [
 	'modify_tables' => '',
 	'clearCacheOnLoad' => 0,
 	'lockType' => '',
-	'version' => '9.5.4',
+	'version' => '9.6.3',
 	'constraints' => [
 		'depends' => [
 			'typo3' => '10.4.0-11.5.99',
diff --git a/ext_localconf.php b/ext_localconf.php
index 59986290feda44edcab5c397c32a547414fdbf5d..43a06cae43cf4e883e7f6a410dd5beb78c3180b3 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -37,7 +37,7 @@ call_user_func(
 			'SgNews',
 			'Overview',
 			[\SGalinski\SgNews\Controller\OverviewController::class => 'overview',],
-			[\SGalinski\SgNews\Controller\OverviewController::class => '',]
+			[\SGalinski\SgNews\Controller\OverviewController::class => 'overview',]
 		);
 
 		\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(