diff --git a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate
index a95a6c7..ac01b7b 100644
--- a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate
+++ b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate
@@ -5,7 +5,6 @@
 ///  - theoretisch sollte es bereits von der aufrufenden Datei 
 ///    eingebunden sein
 	require_once("./config.inc.php");
-//	include_once("./config.inc.php");
 	require_once($$basePath."/config/phpcount.config.php");
 	require_once($$basePath."/config/cwsvJudo.config.php");
 	require_once($$basePath."/ressourcen/phpLib/cwsvJudo/miscAssis.php");
@@ -46,8 +45,8 @@ $endif$
 $if(ampVersionLink)$
 		<link rel="amphtml" href="$ampVersionLink$" />
 $endif$
-$if(phpTitleFunction)$
-		<title><?php $phpTitleFunction$();?></title>
+$if(phpTitleString)$
+		<title><?php echo( $phpTitleString$ );?></title>
 $else$
 		<title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
 $endif$
@@ -79,9 +78,17 @@ $endif$
 			{
 			  "@context": "http://www.schema.org",
 			  "@type": "WebSite",
+$if(phpTitleString)$
+			  "name": "<?php echo( $phpTitleString$ );?>",
+$else$
 			  "name": "$title$",
+$endif$
 			  "alternateName": "$description$",
+$if(canonicalLink)$
+			  "url": "$canonicalLink$",
+$else$
 			  "url": "http://cwsvjudo.bplaced.net",
+$endif$
 			  "image": "http://cwsvjudo.bplaced.net/ressourcen/graphiken/logos/cwsvJudoLogoWappen.256w.png"
 			}
 		</script>
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
index d30d636..9566746 100644
--- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
+++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
@@ -295,6 +295,7 @@ function wkTableHtml(){
 			$siteData['mainContent'] .= 
 				"<h1>Einzelansicht</h1>".
 				"<div class=\"wkInfoBox\">".
+					"<script type=\"application/ld+json\">".wkArray2jsonSdEvent($wk)."</script>".
 					"<h2>".$wk['Veranstaltung']."</h2>".
 					"<h3>Veranstaltungsdaten</h3>".
 					"<ul>".
@@ -416,7 +417,7 @@ if(empty($aWk)) return null;
 $wkInfoBoxHtml = "";
 
 	$wkInfoBoxHtml .= 
-		"<div class=\"wkInfoBox\">".
+		"<div class=\"wkInfoBox\">".wkArray2jsonSdEvent($aWk).
 			"<h1>Einzelansicht ".$aWk['Veranstaltung']."</h1>".
 			"<h2>Veranstaltungsdaten</h2>".
 			"<ul>".
diff --git a/homepage/redesign2018/markdownExperiment/src/md/wkKalender.md b/homepage/redesign2018/markdownExperiment/src/md/wkKalender.md
index 8bb4c33..178ab76 100644
--- a/homepage/redesign2018/markdownExperiment/src/md/wkKalender.md
+++ b/homepage/redesign2018/markdownExperiment/src/md/wkKalender.md
@@ -1,15 +1,14 @@
 ---
 lang: de
-title: "Wettkampfkalender der Judoka des Chemnitzer Freizeit- und Wohngebiets&shy;sportvereines e.&#x202f;V."
-phpTitleFunction: echoWkTitle
+phpTitleString: ( (is_positive_integer( \$_GET['wkId']) )?(getWkName(\$_GET['wkId']).' im '):'').'Wettkampfkalender der Judoka des Chemnitzer Freizeit- und Wohngebiets&shy;sportvereines e.&#x202f;V.'
 author: marko
 keywords:
 	- Judo
 	- Wettkampf
 	- Termine
 description: "Ein Kalender mit Judo-Wettkampfterminen zur Übersicht"
-canonicalLink: "http://cwsvjudo.bplaced.net/wkKalender<?php echo(is_positive_integer($_GET['wkId']?('/'.$_GET['wkId']):''));?>"
-ampVersionLink: "http://amp.cwsvjudo.bplaced.net/wkKalender"
+canonicalLink: "http://cwsvjudo.bplaced.net/wkKalender<?php echo(is_positive_integer($_GET['wkId'])?('/'.$_GET['wkId'].'/'.toAscii(getWkName($_GET['wkId']))):'');?>"
+ampVersionLink: "http://amp.cwsvjudo.bplaced.net/wkKalender<?php echo(is_positive_integer($_GET['wkId'])?('/'.$_GET['wkId']):'');?>"
 ...
 
 <?php wkTableHtml();?>