diff --git a/js/fetchText.js b/js/fetchText.js
index f35fc67..b979575 100644
--- a/js/fetchText.js
+++ b/js/fetchText.js
@@ -29,9 +29,17 @@ function createAcceptanceChart (id) {
     ],
   });
 };
-window.showAcceptance = function (arr) {
+window.showAcceptance = function (arr, autor) {
+  if (!document.getElementById('HoverInfo'))
+    return;
+  document.getElementById('HoverInfo').hidden = !(arr || autor);
+  if (autor) {
+    document.getElementById('AutorInfo').textContent = 'Autor: '+autor;
+    document.getElementById('AutorInfo').hidden = false;
+  } else
+    document.getElementById('AutorInfo').hidden = true;
   if (arr && makeupForm.showAcceptance.checked) {
-    document.getElementById('Acceptance').style.display = 'block';
+    document.getElementById('Acceptance').hidden = false;
     if (arr == chartAcceptanceData) return;
     chartAcceptanceData = arr;
     chartAcceptance.series[0].setData(arr);
@@ -40,8 +48,8 @@ window.showAcceptance = function (arr) {
     else if (arr.length == 3)
       chartAcceptance.xAxis[0].update({categories: ['Nein', 'Enthaltung', 'Ja']});
     else throw 'Unknown vote system!';
-  } else if (document.getElementById('Acceptance'))
-    document.getElementById('Acceptance').style.display = 'none';
+  } else
+    document.getElementById('Acceptance').hidden = true;
 };
 
 function setMakeupForm (el, showingRelease) {
@@ -61,14 +69,16 @@ function setMakeupForm (el, showingRelease) {
   el.genderSelect.addEventListener('input', function () {
     makeupText(currentSite);
   }, false);
-  el.selectProgram.addEventListener('input', function () {
-    filterProgram(currentSite);
-  }, false);
-  el.createRelease.addEventListener('click', function () {
-    makeupForm.isRelease = true;
-    dynFrame.getActiveCommunicator().el.src += ''; // reload
-    el.createRelease.disabled = true;
-  }, false);
+  if (el.selectProgram)
+    el.selectProgram.addEventListener('input', function () {
+      filterProgram(currentSite);
+    }, false);
+  if (el.createRelease)
+    el.createRelease.addEventListener('click', function () {
+      makeupForm.isRelease = true;
+      dynFrame.getActiveCommunicator().el.src += ''; // reload
+      el.createRelease.disabled = true;
+    }, false);
 }
 
 function filterProgram (win) {
@@ -173,7 +183,7 @@ function fetchText (win) {
 
   function isInProgram (className, program) {
     let programs = ['grundsatz', 'eu', 'bundestag'];
-    if (program == 'alles') return true;
+    if ((program == 'alles') || ((typeof className) != 'string')) return true;
     let spl = className.split(' ');
     let hasProgram = false;
     let hasGivenProgram = false;
@@ -383,12 +393,17 @@ function fetchText (win) {
     win.addEventListener('mousemove', function (ev) {
       let el = ev.target;
       let arr = null;
-      while (el)
-        if (el.acceptance) {
+      let autor = '';
+      while (el) {
+        if (arr == null && el.acceptance)
           arr = el.acceptance.arr;
+        if (autor == '' && el.getAttribute('autor'))
+          autor = el.getAttribute('autor');
+        if (autor && arr)
           break;
-        } else el = el.parentElement;
-      parent.showAcceptance(arr);
+        el = el.parentElement;
+      }
+      parent.showAcceptance(arr, autor);
     }, false);
   makeupText(win);
   filterProgram(win);