diff --git a/src/core/js/query_shortcuts.js b/src/core/js/query_shortcuts.js
index 1b4765cebfd3d95faf2beb9b5e948fba4456de2b..c12e2b47b7c8b970b2a8177ebdb529dd5cb47efa 100644
--- a/src/core/js/query_shortcuts.js
+++ b/src/core/js/query_shortcuts.js
@@ -38,7 +38,7 @@
  * [
  *   {
  *     "description": "Find all geological data sets with temperature above {temp} K.",
- *     "query": "FIND Record Geodata with temperature > \"$1\""
+ *     "query": "FIND Record Geodata with temperature > \"{temp}\""
  *   }, {
  *     ...
  *   }
diff --git a/src/core/js/tour.js b/src/core/js/tour.js
index 9e4be98a80ea72fb2dd49d124b4b8536c5ecc8d6..0becc006b1df0f59f681e76061e553032621db2c 100644
--- a/src/core/js/tour.js
+++ b/src/core/js/tour.js
@@ -565,17 +565,18 @@ var tour = new function() {
                 return;
             }
             const ids = Object.keys(highlighters)
+            var highlightable = {}
             for (const id of ids) {
-                var highlightable = $(highlighters[id]);
+                highlightable[id] = $(highlighters[id]);
                 if (id == "button") {
                     // special case, don't look for the highlighter in the content
-                    this._apply_highlighter(button, highlightable);
+                    this._apply_highlighter(button, highlightable[id]);
                 } else {
                     $(button).on('shown.bs.popover', (e) => {
                         console.log("Highlighting:")
                         console.log(highlighters[id]);
-                        console.log(highlightable);
-                        this._apply_highlighter("#" + id, highlightable);
+                        console.log(highlightable[id]);
+                        this._apply_highlighter("#" + id, highlightable[id]);
                     });
                 }
             }