diff --git a/templates/bootstrap4.mustache b/templates/bootstrap4.mustache
index a8bad38..d861ff3 100644
--- a/templates/bootstrap4.mustache
+++ b/templates/bootstrap4.mustache
@@ -32,13 +32,13 @@
     <ul id="filter-tabs-titlegroup-{{tabgroupcounter}}" class="nav nav-tabs" role="tablist">
         {{#tabs}}
             <li class="nav-item">
-                <a class="nav-link {{get_active}}" href="#filter-tabs-content-{{tabgroupcounter}}-{{get_key}}" data-toggle="tab" role="tab" aria-controls="filter-tabs-content-{{tabgroupcounter}}-{{get_key}}">{{get_title}}</a>
+                <a class="nav-link {{get_active}}" id="filter-tabs-{{tabgroupcounter}}-{{get_key}}-tab" href="#filter-tabs-content-{{tabgroupcounter}}-{{get_key}}" data-toggle="tab" role="tab" aria-controls="filter-tabs-content-{{tabgroupcounter}}-{{get_key}}">{{get_title}}</a>
             </li>
         {{/tabs}}
     </ul>
     <div id="filter-tabs-content-{{tabgroupcounter}}" class="tab-content">
         {{#tabs}}
-            <div id="filter-tabs-content-{{tabgroupcounter}}-{{get_key}}" class="tab-pane fade in {{get_active}}" role="tabpanel">
+            <div id="filter-tabs-content-{{tabgroupcounter}}-{{get_key}}" class="tab-pane fade in {{get_active}}" role="tabpanel" aria-labelledby="filter-tabs-{{tabgroupcounter}}-{{get_key}}-tab">
                 <ul id="filter-tabs-titlegroup-{{tabgroupcounter}}-printable" class="nav nav-tabs" role="tablist">
                     <li class="nav-item">
                         <span class="nav-link active">{{get_title}}</span>