diff --git a/Resources/Private/Extensions/News/Templates/Category/List.html b/Resources/Private/Extensions/News/Templates/Category/List.html
index 96a2a1e6..149a7255 100644
--- a/Resources/Private/Extensions/News/Templates/Category/List.html
+++ b/Resources/Private/Extensions/News/Templates/Category/List.html
@@ -28,14 +28,10 @@
 					<f:if condition="{category.item.uid} == {overwriteDemand.categories}">
 						<f:then>
 							<t3kit:register key="additionalBreadCrumbItem" value="{category.item.title}"/>
-							<f:link.page title="{category.item.title}" class="active" pageUid="{settings.listPid}"
-											additionalParams="{tx_news_pi1:{overwriteDemand:{categories: category.item.uid}}}">{category.item.title}
-							</f:link.page>
+							<f:render section="categoryLink" arguments="{category: category, class: 'active'}" />
 						</f:then>
 						<f:else>
-							<f:link.page title="{category.item.title}" pageUid="{settings.listPid}"
-											additionalParams="{tx_news_pi1:{overwriteDemand:{categories: category.item.uid}}}">{category.item.title}
-							</f:link.page>
+							<f:render section="categoryLink" arguments="{category: category}" />
 						</f:else>
 					</f:if>
 
@@ -48,5 +44,24 @@
 	</div>
 </f:section>
 
+<f:section name="categoryLink">
+	<f:if condition="{settings.listPid}">
+		<f:then>
+			<f:link.page title="{category.item.title}"
+						 class="{class}"
+						 pageUid="{settings.listPid}"
+						 additionalParams="{tx_news_pi1:{overwriteDemand:{categories: category.item.uid}}}">
+				{category.item.title}
+			</f:link.page>
+		</f:then>
+		<f:else>
+			<f:link.page title="{category.item.title}"
+						 class="{class}"
+						 additionalParams="{tx_news_pi1:{overwriteDemand:{categories: category.item.uid}}}">
+				{category.item.title}
+			</f:link.page>
+		</f:else>
+	</f:if>
+</f:section>
 </html>
 
diff --git a/Resources/Private/Extensions/News/Templates/Tag/List.html b/Resources/Private/Extensions/News/Templates/Tag/List.html
index ff20234e..62cbca3a 100644
--- a/Resources/Private/Extensions/News/Templates/Tag/List.html
+++ b/Resources/Private/Extensions/News/Templates/Tag/List.html
@@ -18,14 +18,10 @@
 					<f:if condition="{tag.uid} == {overwriteDemand.tags}">
 						<f:then>
 							<t3kit:register key="additionalBreadCrumbItem" value="{tag.title}"/>
-							<f:link.page title="{tag.title}" class="active" pageUid="{settings.listPid}" additionalParams="{tx_news_pi1:{overwriteDemand:{tags: tag}}}">
-								{tag.title}
-							</f:link.page>
+							<f:render section="tagLink" arguments="{tag: tag, class: 'active'}" />
 						</f:then>
 						<f:else>
-							<f:link.page title="{tag.title}" pageUid="{settings.listPid}" additionalParams="{tx_news_pi1:{overwriteDemand:{tags: tag}}}">
-								{tag.title}
-							</f:link.page>
+							<f:render section="tagLink" arguments="{tag: tag}" />
 						</f:else>
 					</f:if>
 				</li>
@@ -34,5 +30,19 @@
 	</f:if>
 </f:section>
 
+<f:section name="tagLink">
+	<f:if condition="{settings.listPid}">
+		<f:then>
+			<f:link.page title="{tag.title}" class="{class}" pageUid="{settings.listPid}" additionalParams="{tx_news_pi1:{overwriteDemand:{tags: tag}}}">
+				{tag.title}
+			</f:link.page>
+		</f:then>
+		<f:else>
+			<f:link.page title="{tag.title}" class="{class}" additionalParams="{tx_news_pi1:{overwriteDemand:{tags: tag}}}">
+				{tag.title}
+			</f:link.page>
+		</f:else>
+	</f:if>
+</f:section>
 </html>