diff --git a/js/DynamicIFrame.js b/js/DynamicIFrame.js
index 3723c94..b12f84f 100644
--- a/js/DynamicIFrame.js
+++ b/js/DynamicIFrame.js
@@ -449,7 +449,7 @@ function DynamicIFrame (FrameBox, debugLogging=false) { with (this) {
       return;
     }
     // Falls verknuepfter menuLink schon bekannt
-    if (currentSiteAnchors.length != 0 && currentSiteAnchors[anchorPos]['link']) {
+    if ((currentSiteAnchors.length > anchorPos) && currentSiteAnchors[anchorPos]['link']) {
       activateLink(currentSiteAnchors[anchorPos]['link']);
       return;
     }
diff --git a/js/fetchText.js b/js/fetchText.js
index e5351ad..1a25111 100644
--- a/js/fetchText.js
+++ b/js/fetchText.js
@@ -154,7 +154,7 @@ function makeupText (win) {
 }
 
 function fetchText (win) {
-  let query = window.location.href.split('?').pop().split('&');
+  let query = window.location.href.split('#').shift().split('?').pop().split('&');
   for (let i = 0; i < query.length; i++) {
     query[i] = query[i].split('=');
     if (query[i].length == 2 && query[i][0] == 'program') {