diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/galTable.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/galTable.php
index 2e1a645..24328bc 100644
--- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/galTable.php
+++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/galTable.php
@@ -145,7 +145,8 @@ $messages=array();
 		foreach($galListe as $gal){
 			$galDate = mb_convert_encoding($gal['datum'], 'UTF-8', 'ISO-8859-1');
 			echo(
-				"<tr onclick=\"window.document.location='".mb_convert_encoding($gal['url'], 'UTF-8', 'ISO-8859-1')."';\">".
+				"<tr ".((strpos( $_SERVER['ORIG_PATH_TRANSLATED'], "pages/amp" ) !== false)?(""):("onclick=\"window.document.location='".mb_convert_encoding($gal['url'], 'UTF-8', 'ISO-8859-1')."';\"")).">".
+//				"<tr onclick=\"window.document.location='".mb_convert_encoding($gal['url'], 'UTF-8', 'ISO-8859-1')."';\">".
 //					"<td class=\"noWrap\">".
 					"<td >".
 						"<time datetime=\"".mb_convert_encoding($gal['datum'], 'UTF-8', 'ISO-8859-1')."\">".mb_convert_encoding($gal['datum'], 'UTF-8', 'ISO-8859-1')."</time>".
diff --git a/homepage/redesign2018/markdownExperiment/src/md/wkKalender.md b/homepage/redesign2018/markdownExperiment/src/md/wkKalender.md
index 178ab76..3b0bcf6 100644
--- a/homepage/redesign2018/markdownExperiment/src/md/wkKalender.md
+++ b/homepage/redesign2018/markdownExperiment/src/md/wkKalender.md
@@ -7,8 +7,8 @@ keywords:
 	- 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'].'/'.toAscii(getWkName($_GET['wkId']))):'');?>"
-ampVersionLink: "http://amp.cwsvjudo.bplaced.net/wkKalender<?php echo(is_positive_integer($_GET['wkId'])?('/'.$_GET['wkId']):'');?>"
+canonicalLink: "http://cwsvjudo.bplaced.net/wkKalender<?php echo(is_positive_integer($_GET['wkId'])?('/'.$_GET['wkId'].'/'.toAscii(html_entity_decode(getWkName($_GET['wkId'])))):'');?>"
+ampVersionLink: "http://amp.cwsvjudo.bplaced.net/wkKalender<?php echo(is_positive_integer($_GET['wkId'])?('/'.$_GET['wkId'].'/'.toAscii(html_entity_decode(getWkName($_GET['wkId'])))):'');?>"
 ...
 
 <?php wkTableHtml();?>