diff --git a/app/templates/corpora/_analysis/query_builder/_expert_mode.html.j2 b/app/templates/corpora/_analysis/query_builder/_expert_mode.html.j2
index 9926b367..102edeff 100644
--- a/app/templates/corpora/_analysis/query_builder/_expert_mode.html.j2
+++ b/app/templates/corpora/_analysis/query_builder/_expert_mode.html.j2
@@ -5,9 +5,9 @@
       <i class="material-icons prefix">search</i>
       <input class="validate corpus-analysis-action" id="corpus-analysis-concordance-form-query" name="query" type="text" required pattern=".*\S+.*" placeholder="Type in your query via CQL"></input>
       <span class="error-color-text helper-text hide" id="corpus-analysis-concordance-error"></span>
-      <a class="modal-trigger" data-manual-modal-chapter="manual-modal-cqp-query-language" href="#manual-modal" style="margin-left: 40px;"><i class="material-icons" style="font-size: inherit;">help</i> Corpus Query Language tutorial</a>
+      <a href="{{ url_for('main.manual', _anchor='manual-cqp-query-language') }}" target="manual" style="margin-left: 40px;"><i class="material-icons" style="font-size: inherit;">help</i> Corpus Query Language tutorial</a>
       <span> | </span>
-      <a class="modal-trigger" data-manual-modal-chapter="manual-modal-tagsets" href="#manual-modal"><i class="material-icons" style="font-size: inherit;">info</i> Tagsets</a>
+      <a href="{{ url_for('main.manual', _anchor='manual-tagsets') }}" target="manual"><i class="material-icons" style="font-size: inherit;">info</i> Tagsets</a>
     </div>
     <div class="input-field col s12 m3">
       <i class="material-icons prefix">arrow_forward</i>
@@ -17,7 +17,7 @@
     <div class="col s12 m3 l3 right-align">
       <p class="hide-on-small-only">&nbsp;</p>
       <button class="btn waves-effect waves-light corpus-analysis-action" id="corpus-analysis-concordance-form-submit" type="submit" name="submit">
-        Send 
+        Send
         <i class="material-icons right">send</i>
       </button>
     </div>
diff --git a/app/templates/corpora/_analysis/query_builder/_query_builder.html.j2 b/app/templates/corpora/_analysis/query_builder/_query_builder.html.j2
index 3e8a8318..37d4986b 100644
--- a/app/templates/corpora/_analysis/query_builder/_query_builder.html.j2
+++ b/app/templates/corpora/_analysis/query_builder/_query_builder.html.j2
@@ -22,9 +22,9 @@
   <div class="row">
     <div class="col s12">
       <span class="error-color-text helper-text hide" id="corpus-analysis-concordance-error"></span>
-      <a class="modal-trigger" data-manual-modal-chapter="manual-modal-cqp-query-language" href="#manual-modal"><i class="material-icons" style="font-size: inherit;">help</i> Corpus Query Language tutorial</a>
+      <a href="{{ url_for('main.manual', _anchor='manual-cqp-query-language') }}" target="manual"><i class="material-icons" style="font-size: inherit;">help</i> Corpus Query Language tutorial</a>
       <span> | </span>
-      <a class="modal-trigger" data-manual-modal-chapter="manual-modal-tagsets" href="#manual-modal"><i class="material-icons" style="font-size: inherit;">info</i> Tagsets</a>
+      <a href="{{ url_for('main.manual', _anchor='manual-tagsets') }}" target="manual"><i class="material-icons" style="font-size: inherit;">info</i> Tagsets</a>
     </div>
   </div>
   <div class="row">
@@ -40,14 +40,14 @@
       <a class="btn-small waves-effect waves-light tooltipped modal-trigger" href="#corpus-analysis-concordance-positional-attr-modal" data-position="bottom" data-tooltip="Search for any token, for example a word, a lemma or a part-of-speech tag">Add new token to your query</a>
       <a class="btn-small waves-effect waves-light tooltipped modal-trigger" href="#corpus-analysis-concordance-structural-attr-modal" data-position="bottom" data-tooltip="Structure your query with structural attributes, for example sentences, entities or annotate the text">Add structural attributes to your query</a>
       <a class="btn-small waves-effect waves-light tooltipped dropdown-trigger disabled" data-target="corpus-analysis-concordance-token-incidence-modifiers-dropdown" data-toggle-area="token-incidence-modifiers" data-position="top" data-tooltip="Incidence Modifiers are special characters or patterns, <br>which determine how often a character represented previously should occur.">incidence modifiers</a>
-      <a class="modal-trigger" data-manual-modal-chapter="manual-modal-query-builder" href="#manual-modal"><i class="material-icons left" style="color:black">help_outline</i></a>
+      <a href="{{ url_for('main.manual', _anchor='manual-query-builder') }}" target="manual"><i class="material-icons left" style="color:black">help_outline</i></a>
     </div>
   </div>
   <div class="row">
     <div class="col s12 right-align">
       <p class="hide-on-small-only">&nbsp;</p>
       <button class="btn waves-effect waves-light corpus-analysis-action" type="submit" name="submit">
-        Send 
+        Send
         <i class="material-icons right">send</i>
       </button>
     </div>
@@ -67,7 +67,7 @@
 <div id="corpus-analysis-concordance-structural-attr-modal" class="modal">
   <div class="modal-content">
     <div class="attr-modal-header">
-      <h5>Which structural attribute do you want to add to your query?<a class="modal-trigger" data-manual-modal-chapter="manual-modal-query-builder" data-manual-modal-chapter-anchor="add-structural-attribute-tutorial" href="#manual-modal"><i class="material-icons left" id="corpus-analysis-concordance-add-structural-attribute-tutorial-info-icon">help_outline</i></a></h5>
+      <h5>Which structural attribute do you want to add to your query?<a href="{{ url_for('main.manual', _anchor='add-structural-attribute-tutorial') }}" target="manual"><i class="material-icons left" id="corpus-analysis-concordance-add-structural-attribute-tutorial-info-icon">help_outline</i></a></h5>
     </div>
     <p></p>
     <br>
@@ -128,7 +128,7 @@
     <div class="row attr-modal-header">
       <p></p>
       <div class="col s12">
-        <h5>Which kind of token are you looking for? <a class="modal-trigger" data-manual-modal-chapter="manual-modal-query-builder" data-manual-modal-chapter-anchor="add-new-token-tutorial" href="#manual-modal"><i class="material-icons left" id="corpus-analysis-concordance-token-tutorial-info-icon">help_outline</i></a></h5>
+        <h5>Which kind of token are you looking for? <a href="{{ url_for('main.manual', _anchor='add-new-token-tutorial') }}" target="manual"><i class="material-icons left" id="corpus-analysis-concordance-token-tutorial-info-icon">help_outline</i></a></h5>
       </div>
       <div class="input-field col s3" style="margin-left:42px;">
         <select id="corpus-analysis-concordance-positional-attr-selection">
@@ -234,7 +234,7 @@
           <label>Part-of-speech tags</label>
         </div>
       </template>
-      
+
       <template class="token-builder-section" data-token-builder-section="german-pos">
         <div class= "input-field col s4" data-kind-of-token="german-pos">
           <select name="germanpos">
@@ -337,7 +337,7 @@
     </div>
     <div id="corpus-analysis-concordance-token-edit-options" data-toggle-area="input-field-options">
       <div class="row">
-        <h6>Options to edit your token: <a class="modal-trigger" data-manual-modal-chapter="manual-modal-query-builder" href="#manual-modal" data-manual-modal-chapter-anchor="edit-options-tutorial"><i class="material-icons left" id="corpus-analysis-concordance-edit-options-tutorial-info-icon">help_outline</i></a></h6>
+        <h6>Options to edit your token: <a href="{{ url_for('main.manual', _anchor='edit-options-tutorial') }}" target="manual"><i class="material-icons left" id="corpus-analysis-concordance-edit-options-tutorial-info-icon">help_outline</i></a></h6>
       </div>
       <p></p>
       <div class="row">
@@ -359,10 +359,10 @@
 
       </div>
     </div>
-    
+
     {{ exactly_n_modal_content("character") }}
     {{ exactly_nm_modal_content("character") }}
-      
+
   </div>
 </div>
 {% endmacro %}