diff --git a/dev/demo/build.html b/dev/demo/build.html
index 1a7a86d..9e577de 100644
--- a/dev/demo/build.html
+++ b/dev/demo/build.html
@@ -4,7 +4,13 @@
     <title>Complete Demo</title>
     <meta charset="utf-8" />
     <link type="text/css" rel="stylesheet" href="../css/kalamar.css" />
-    <script src="../../public/js/kalamar-0.14.1.js" async="async"></script>
+    <script>//<![CDATA[
+
+  window.KorAP = window.KorAP || {};
+  KorAP.URL = '/';
+
+//]]></script>
+    <script src="../../public/js/kalamar-0.18.0-en.js" async="async"></script>
   </head>
   <body>
     <div id="kalamar-bg"></div>
diff --git a/dev/js/src/hint/array.js b/dev/js/src/hint/array.js
index 2575004..822d658 100644
--- a/dev/js/src/hint/array.js
+++ b/dev/js/src/hint/array.js
@@ -1,3 +1,4 @@
+/*
 var menuContent = [
   ['cnx/c', 'cnx', 'c'],
   ['mate/c', 'mate', 'c'],
@@ -5,6 +6,7 @@
   ['xip/c', 'xip', 'c'],
   ['tt/c', 'tt', 'c']
 ];
+*/
 
 var namedEntities = [
   ["I-LOC",  "I-LOC ",  "Location"],
@@ -192,14 +194,21 @@
 define(function () {
   var obj = {
     "-" : [
+      ["Base Annotation", "base/s=", "Structure"],
       ["Connexor", "cnx/", "Constituency, Lemma, Morphology, Part-of-Speech, Syntax"],
       ["CoreNLP", "corenlp/", "Constituency, Named Entities, Part-of-Speech"],
+      ["DeReKo", "dereko/s=", "Structure"],
       ["Mate", "mate/", "Lemma, Morphology, Part-of-Speech"],
       ["OpenNLP", "opennlp/", "Part-of-Speech"],
       ["Schreibgebrauch", "sgbr/", "Lemma, Lemma Variants, Part-of-Speech"],
       ["TreeTagger", "tt/", "Lemma, Part-of-Speech"],
       ["Xerox Parser", "xip/", "Constituency, Lemma, Part-of-Speech"]
     ],
+    "base/s=" : [
+      ["s", "s", "Sentence"],
+      ["p", "p", "Paragraph"],
+      ["t", "t", "Text"]
+    ],
     "corenlp/" : [
       ["Constituency", "c="],
       ["Named Entity", "ne=" , "Combined"],