diff --git a/src/backend/views/pages/page.twig b/src/backend/views/pages/page.twig
index 09f850d..e123c4d 100644
--- a/src/backend/views/pages/page.twig
+++ b/src/backend/views/pages/page.twig
@@ -1,10 +1,6 @@
 {% extends 'layout.twig' %}
 
 {% block body %}
-
-  {# Remove after testing #}
-{#  <div class="page-intersection-field"></div>#}
-
   <article class="page" data-module="page">
     <header class="page__header">
       <a href="/" class="page__header-nav">
diff --git a/src/frontend/js/modules/page.js b/src/frontend/js/modules/page.js
index 8023d15..d1d623e 100644
--- a/src/frontend/js/modules/page.js
+++ b/src/frontend/js/modules/page.js
@@ -43,6 +43,12 @@ export default class Page {
   async createTableOfContent() {
     const { default: TableOfContent } = await import(/* webpackChunkName: "table-of-content" */ './table-of-content');
 
-    return new TableOfContent();
+    return new TableOfContent({
+      tagSelector:
+        'h2.block-header--anchor,' +
+        'h3.block-header--anchor,' +
+        'h4.block-header--anchor',
+      tocWrapperSelector: '#layout-right-column',
+    });
   }
 }
diff --git a/src/frontend/js/modules/table-of-content.js b/src/frontend/js/modules/table-of-content.js
index 2d839db..9cfc3e4 100644
--- a/src/frontend/js/modules/table-of-content.js
+++ b/src/frontend/js/modules/table-of-content.js
@@ -5,7 +5,10 @@ export default class TableOfContent {
   /**
    * Initialize table of content
    */
-  constructor() {
+  constructor({ tagSelector, tocWrapperSelector }) {
+    this.tagSelector = tagSelector || 'h2,h3,h4';
+    this.tocWrapperSelector = tocWrapperSelector;
+
     this.init();
   }
 
@@ -14,6 +17,15 @@ export default class TableOfContent {
    */
   init() {
     this.findTagsOnThePage();
+
+    /**
+     * Check if no tags found
+     */
+    if (this.tags.length === 0) {
+      console.info('Table of content is not needed');
+      return;
+    }
+
     this.createTableOfContent();
     this.addTableOfContent();
     this.initIntersectionObserver();
@@ -23,21 +35,7 @@ export default class TableOfContent {
    * Find all tags on the page
    */
   findTagsOnThePage() {
-    const tags = document.querySelectorAll(`.block-header--anchor`);
-
-    const allowedTags = [
-      'h2',
-      'h3',
-      'h4',
-      'h5',
-      'h6',
-    ];
-
-    this.tags = Array.prototype.filter.call(tags, (tag) => {
-      console.log(tag.tagName.toLowerCase());
-
-      return allowedTags.includes(tag.tagName.toLowerCase());
-    });
+    this.tags = document.querySelectorAll(this.tagSelector);
   }
 
   /**
@@ -53,7 +51,6 @@ export default class TableOfContent {
    */
   createTableOfContent() {
     this.tocElement = document.createElement('section');
-
     this.tocElement.classList.add('table-of-content__list');
 
     this.tags.forEach((tag) => {
@@ -89,8 +86,13 @@ export default class TableOfContent {
     container.classList.add('table-of-content');
     container.appendChild(this.tocElement);
 
-    document.getElementById('layout-right-column')
-      .appendChild(container);
+    const tocWrapper = document.querySelector(this.tocWrapperSelector);
+
+    if (!tocWrapper) {
+      throw new Error('Table of content wrapper not found');
+    }
+
+    tocWrapper.appendChild(container);
   }
 
   /**
@@ -106,14 +108,6 @@ export default class TableOfContent {
         const target = entry.target;
         const targetLink = target.querySelector('a').getAttribute('href');
 
-        // @todo remove after testing
-        try {
-          const pageIntersectionField = document.querySelector('.page-intersection-field');
-
-          pageIntersectionField.style.top = `${entry.rootBounds.top}px`;
-          pageIntersectionField.style.height = `${entry.rootBounds.height}px`;
-        } catch (e) {}
-
         /**
          * Intersection state of block
          *
diff --git a/src/frontend/styles/components/table-of-content.pcss b/src/frontend/styles/components/table-of-content.pcss
index dc0cd70..bf26ba4 100644
--- a/src/frontend/styles/components/table-of-content.pcss
+++ b/src/frontend/styles/components/table-of-content.pcss
@@ -58,21 +58,3 @@
     }
   }
 }
-
-
-
-
-
-
-
-.page-intersection-field {
-  background-color: rgba(255,0,0,.1);
-  position: fixed;
-  left: 0;
-  width: 100%;
-  z-index: 0;
-}
-
-h2, h3, h4, h5, h6 {
- //background-color: #699a50;
-}