diff --git a/Resources/Private/Templates/SingleView/SingleView.html b/Resources/Private/Templates/SingleView/SingleView.html
index 297b9e61731f2aac1c6b71fb4763027d6d768120..24f923e6e9bb2334978180c9656568a024d79616 100644
--- a/Resources/Private/Templates/SingleView/SingleView.html
+++ b/Resources/Private/Templates/SingleView/SingleView.html
@@ -9,25 +9,25 @@
 		<f:if condition="{settings.publisherLogo}">
 			<f:alias map="{leftBrace: '{', rightBrace: '}'}">
 				<script type="application/ld+json">
-						{leftBrace}
-							"@context": "http://schema.org/",
-							"@type": "NewsArticle",
-							"author": "{newsMetaData.news.author}",
-							"publisher": {leftBrace}
-								"@type": "Organization",
-								"name": "{settings.publisher}",
-								"logo":   {leftBrace}
-									"@type": "ImageObject",
-									"url": "{settings.publisherLogo}"
-								 {rightBrace}
-							{rightBrace},
-							"image": "<f:uri.image absolute="TRUE" image="{newsMetaData.imageObject}" />",
-							"headline": "{newsMetaData.news.navTitle}",
-							"description": "{newsMetaData.news.description}",
-							"dateCreated": "<f:format.date format="Y-m-d">{newsMetaData.news.creationDate}</f:format.date>",
-							"datePublished": "<f:format.date format="Y-m-d">{newsMetaData.news.creationDate}</f:format.date>",
-							"dateModified": "<f:format.date format="Y-m-d">{newsMetaData.news.lastUpdated}</f:format.date>"
-						{rightBrace}
+					{leftBrace}
+						"@context": "http://schema.org/",
+						"@type": "NewsArticle",
+						"author": "{newsMetaData.news.author}",
+						"publisher": {leftBrace}
+							"@type": "Organization",
+							"name": "{settings.publisher}",
+							"logo": {leftBrace}
+								"@type": "ImageObject",
+								"url": "{settings.publisherLogo}"
+							{rightBrace}
+						{rightBrace},
+						"image": "<f:uri.image absolute="TRUE" image="{newsMetaData.imageObject}" />",
+						"headline": "{newsMetaData.news.navTitle}",
+						"description": "{newsMetaData.news.description}",
+						"dateCreated": "<f:format.date format="Y-m-d">{newsMetaData.news.creationDate}</f:format.date>",
+						"datePublished": "<f:format.date format="Y-m-d">{newsMetaData.news.creationDate}</f:format.date>",
+						"dateModified": "<f:format.date format="Y-m-d">{newsMetaData.news.lastUpdated}</f:format.date>"
+					{rightBrace}
 				</script>
 			</f:alias>
 		</f:if>
@@ -41,9 +41,9 @@
 					<div class="tx-sgnews-single-image">
 						<picture>
 							<source media="(max-width: 1200px)"
-									srcset="{f:uri.image(src: newsMetaData.imageObject.uid, treatIdAsReference: '1', width: '1200c', height: '403c', cropVariant: 'small')}">
+								srcset="{f:uri.image(src: newsMetaData.imageObject.uid, treatIdAsReference: '1', width: '1200c', height: '403c', cropVariant: 'small')}">
 							<f:image image="{newsMetaData.imageObject}" alt="" width="1845c"
-									 height="619c" cropVariant="large"/>
+								height="619c" cropVariant="large" />
 						</picture>
 					</div>
 				</f:if>
@@ -54,40 +54,43 @@
 					<div class="tx-sgnews-teaser">
 						<div class="tx-sgnews-teaser-inner">
 							<div class="tx-sgnews-teaser-meta">
-								<span class="author">
-									<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="#FFF" d="M224 256c70.7 0 128-57.3 128-128S294.7 0 224 0 96 57.3 96 128s57.3 128 128 128zm89.6 32h-16.7c-22.2 10.2-46.9 16-72.9 16s-50.6-5.8-72.9-16h-16.7C60.2 288 0 348.2 0 422.4V464c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48v-41.6c0-74.2-60.2-134.4-134.4-134.4z"/></svg>
-									<f:if condition="{newsMetaData.news.authorFrontendUser}">
-										<f:then>
-											<f:if condition="{newsMetaData.news.authorFrontendUser.www}">
-												<f:then>
-													<f:link.page pageUid="{newsMetaData.news.authorFrontendUser.www}">
+								<f:if condition="{newsMetaData.news.authorFrontendUser}">
+									<f:then>
+										<span class="author">
+											<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="#FFF" d="M224 256c70.7 0 128-57.3 128-128S294.7 0 224 0 96 57.3 96 128s57.3 128 128 128zm89.6 32h-16.7c-22.2 10.2-46.9 16-72.9 16s-50.6-5.8-72.9-16h-16.7C60.2 288 0 348.2 0 422.4V464c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48v-41.6c0-74.2-60.2-134.4-134.4-134.4z" /></svg>
+												<f:if condition="{newsMetaData.news.authorFrontendUser.www}">
+													<f:then>
+														<f:link.page pageUid="{newsMetaData.news.authorFrontendUser.www}">
+															{newsMetaData.news.authorFrontendUser.name}
+														</f:link.page>
+													</f:then>
+													<f:else>
 														{newsMetaData.news.authorFrontendUser.name}
-													</f:link.page>
-												</f:then>
-												<f:else>
-													{newsMetaData.news.authorFrontendUser.name}
-												</f:else>
-											</f:if>
-										</f:then>
-										<f:else>
+													</f:else>
+												</f:if>
+										</span>
+									</f:then>
+									<f:else if="{newsMetaData.news.author}">
+										<span class="author">
+											<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="#FFF" d="M224 256c70.7 0 128-57.3 128-128S294.7 0 224 0 96 57.3 96 128s57.3 128 128 128zm89.6 32h-16.7c-22.2 10.2-46.9 16-72.9 16s-50.6-5.8-72.9-16h-16.7C60.2 288 0 348.2 0 422.4V464c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48v-41.6c0-74.2-60.2-134.4-134.4-134.4z" /></svg>
 											{newsMetaData.news.author}
-										</f:else>
-									</f:if>
-								</span>
+										</span>
+									</f:else>
+								</f:if>
 								<f:if condition="{newsMetaData.news.location}">
 									<span class="location">
-										<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path fill="#FFF" d="M172.268 501.67C26.97 291.031 0 269.413 0 192 0 85.961 85.961 0 192 0s192 85.961 192 192c0 77.413-26.97 99.031-172.268 309.67-9.535 13.774-29.93 13.773-39.464 0z"/></svg>
+										<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path fill="#FFF" d="M172.268 501.67C26.97 291.031 0 269.413 0 192 0 85.961 85.961 0 192 0s192 85.961 192 192c0 77.413-26.97 99.031-172.268 309.67-9.535 13.774-29.93 13.773-39.464 0z" /></svg>
 										{newsMetaData.news.location}
 									</span>
 								</f:if>
 
 								<span class="date">
-									<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#FFF" d="M256 8C119 8 8 119 8 256s111 248 248 248 248-111 248-248S393 8 256 8zm57.1 350.1L224.9 294c-3.1-2.3-4.9-5.9-4.9-9.7V116c0-6.6 5.4-12 12-12h48c6.6 0 12 5.4 12 12v137.7l63.5 46.2c5.4 3.9 6.5 11.4 2.6 16.8l-28.2 38.8c-3.9 5.3-11.4 6.5-16.8 2.6z"/></svg>
+									<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#FFF" d="M256 8C119 8 8 119 8 256s111 248 248 248 248-111 248-248S393 8 256 8zm57.1 350.1L224.9 294c-3.1-2.3-4.9-5.9-4.9-9.7V116c0-6.6 5.4-12 12-12h48c6.6 0 12 5.4 12 12v137.7l63.5 46.2c5.4 3.9 6.5 11.4 2.6 16.8l-28.2 38.8c-3.9 5.3-11.4 6.5-16.8 2.6z" /></svg>
 									<f:format.date format="{f:translate(key:'frontend.dateformat')}">{newsMetaData.news.lastUpdated}</f:format.date>
 								</span>
 
 								<span class="category">
-									<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#FFF" d="M0 252.118V48C0 21.49 21.49 0 48 0h204.118a48 48 0 0 1 33.941 14.059l211.882 211.882c18.745 18.745 18.745 49.137 0 67.882L293.823 497.941c-18.745 18.745-49.137 18.745-67.882 0L14.059 286.059A48 48 0 0 1 0 252.118zM112 64c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48z"/></svg>
+									<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#FFF" d="M0 252.118V48C0 21.49 21.49 0 48 0h204.118a48 48 0 0 1 33.941 14.059l211.882 211.882c18.745 18.745 18.745 49.137 0 67.882L293.823 497.941c-18.745 18.745-49.137 18.745-67.882 0L14.059 286.059A48 48 0 0 1 0 252.118zM112 64c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48z" /></svg>
 									<a href="{f:uri.page(pageUid: '{newsMetaData.category.uid}')}">
 										{newsMetaData.category.subtitleWithFallbackToTitle}
 									</a>
@@ -95,7 +98,7 @@
 								<f:if condition="{newsMetaData.news.tags}">
 									<br />
 									<span class="tags">
-										<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="#FFF" d="M497.941 225.941L286.059 14.059A48 48 0 0 0 252.118 0H48C21.49 0 0 21.49 0 48v204.118a48 48 0 0 0 14.059 33.941l211.882 211.882c18.744 18.745 49.136 18.746 67.882 0l204.118-204.118c18.745-18.745 18.745-49.137 0-67.882zM112 160c-26.51 0-48-21.49-48-48s21.49-48 48-48 48 21.49 48 48-21.49 48-48 48zm513.941 133.823L421.823 497.941c-18.745 18.745-49.137 18.745-67.882 0l-.36-.36L527.64 323.522c16.999-16.999 26.36-39.6 26.36-63.64s-9.362-46.641-26.36-63.64L331.397 0h48.721a48 48 0 0 1 33.941 14.059l211.882 211.882c18.745 18.745 18.745 49.137 0 67.882z"/></svg>
+										<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="#FFF" d="M497.941 225.941L286.059 14.059A48 48 0 0 0 252.118 0H48C21.49 0 0 21.49 0 48v204.118a48 48 0 0 0 14.059 33.941l211.882 211.882c18.744 18.745 49.136 18.746 67.882 0l204.118-204.118c18.745-18.745 18.745-49.137 0-67.882zM112 160c-26.51 0-48-21.49-48-48s21.49-48 48-48 48 21.49 48 48-21.49 48-48 48zm513.941 133.823L421.823 497.941c-18.745 18.745-49.137 18.745-67.882 0l-.36-.36L527.64 323.522c16.999-16.999 26.36-39.6 26.36-63.64s-9.362-46.641-26.36-63.64L331.397 0h48.721a48 48 0 0 1 33.941 14.059l211.882 211.882c18.745 18.745 18.745 49.137 0 67.882z" /></svg>
 										<f:for each="{newsMetaData.news.tags}" as="tag" iteration="it">
 											{tag.title}<f:if condition="{it.isLast}"><f:else>, </f:else></f:if>
 										</f:for>
@@ -172,7 +175,7 @@
 					<div class="tx-sgnews-single-footer-browser">
 						<f:if condition="{previousNews}">
 							<a href="{f:uri.page(pageUid: '{previousNews.uid}')}" class="btn btn-md btn-info tx-sgnews-footer-browser-previous">
-								<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#FFF" d="M256 504C119 504 8 393 8 256S119 8 256 8s248 111 248 248-111 248-248 248zM142.1 273l135.5 135.5c9.4 9.4 24.6 9.4 33.9 0l17-17c9.4-9.4 9.4-24.6 0-33.9L226.9 256l101.6-101.6c9.4-9.4 9.4-24.6 0-33.9l-17-17c-9.4-9.4-24.6-9.4-33.9 0L142.1 239c-9.4 9.4-9.4 24.6 0 34z"/></svg>
+								<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#FFF" d="M256 504C119 504 8 393 8 256S119 8 256 8s248 111 248 248-111 248-248 248zM142.1 273l135.5 135.5c9.4 9.4 24.6 9.4 33.9 0l17-17c9.4-9.4 9.4-24.6 0-33.9L226.9 256l101.6-101.6c9.4-9.4 9.4-24.6 0-33.9l-17-17c-9.4-9.4-24.6-9.4-33.9 0L142.1 239c-9.4 9.4-9.4 24.6 0 34z" /></svg>
 								<f:translate key="frontend.singleview.previousArticle" />
 							</a>
 						</f:if>
@@ -180,7 +183,7 @@
 						<f:if condition="{nextNews}">
 							<a href="{f:uri.page(pageUid: '{nextNews.uid}')}" class="btn btn-md btn-info tx-sgnews-footer-browser-next">
 								<f:translate key="frontend.singleview.nextArticle" />
-								<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#FFF" d="M256 8c137 0 248 111 248 248S393 504 256 504 8 393 8 256 119 8 256 8zm113.9 231L234.4 103.5c-9.4-9.4-24.6-9.4-33.9 0l-17 17c-9.4 9.4-9.4 24.6 0 33.9L285.1 256 183.5 357.6c-9.4 9.4-9.4 24.6 0 33.9l17 17c9.4 9.4 24.6 9.4 33.9 0L369.9 273c9.4-9.4 9.4-24.6 0-34z"/></svg>
+								<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#FFF" d="M256 8c137 0 248 111 248 248S393 504 256 504 8 393 8 256 119 8 256 8zm113.9 231L234.4 103.5c-9.4-9.4-24.6-9.4-33.9 0l-17 17c-9.4 9.4-9.4 24.6 0 33.9L285.1 256 183.5 357.6c-9.4 9.4-9.4 24.6 0 33.9l17 17c9.4 9.4 24.6 9.4 33.9 0L369.9 273c9.4-9.4 9.4-24.6 0-34z" /></svg>
 							</a>
 						</f:if>
 					</div>