diff --git a/wax-prosemirror-services/src/CodeBlockService/CodeBlockTool.js b/wax-prosemirror-services/src/CodeBlockService/CodeBlockTool.js
index 79265aacbd4959a432cb548a8e1befe14406659d..b6a816e841846e4baeb6a8c5872299c9e2588a80 100644
--- a/wax-prosemirror-services/src/CodeBlockService/CodeBlockTool.js
+++ b/wax-prosemirror-services/src/CodeBlockService/CodeBlockTool.js
@@ -15,7 +15,6 @@ class CodeBlockTool extends Tools {
   }
 
   select = (state, activeViewId, activeView) => {
-    if (!activeView) return false;
     const { disallowedTools } = activeView.props;
     if (disallowedTools.includes('codeBlock')) return false;
     return true;
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapQuestion.js b/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapQuestion.js
index 9c879f50ff04fca8ba0c3978609581e13edbd4f2..3e683910cc354af3733ad2d9bec5b7dc14350c46 100644
--- a/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapQuestion.js
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapQuestion.js
@@ -19,7 +19,6 @@ class FillTheGapQuestion extends Tools {
   }
 
   select = (state, activeViewId, activeView) => {
-    if (!activeView) return false;
     const { disallowedTools } = activeView.props;
     let status = true;
     const { from, to } = state.selection;
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapNode.js b/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapNode.js
index 490f71fc6b53bd56cdfecf9f61ce181e71b8ad38..7afdcfe46c586c87ed81a78fe90761db056d1c34 100644
--- a/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapNode.js
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapNode.js
@@ -10,7 +10,7 @@ const fillTheGapNode = {
   },
   parseDOM: [
     {
-      tag: 'span',
+      tag: 'span.fill-the-gap',
       getAttrs(dom) {
         return {
           id: dom.getAttribute('id'),
diff --git a/wax-prosemirror-services/src/ImageService/Image.js b/wax-prosemirror-services/src/ImageService/Image.js
index 902ab5600f2a046c897879ad785700aea698cbee..501a6aa0c4e3e761ddaffe6d93ae677fd3abfa63 100644
--- a/wax-prosemirror-services/src/ImageService/Image.js
+++ b/wax-prosemirror-services/src/ImageService/Image.js
@@ -20,7 +20,6 @@ class Image extends Tools {
   }
 
   select = activeView => {
-    if (!activeView) return false;
     const {
       selection: { from },
     } = activeView.state;
diff --git a/wax-prosemirror-services/src/ListsService/BulletListService/BulletList.js b/wax-prosemirror-services/src/ListsService/BulletListService/BulletList.js
index f1c3b8772d3163734d573d3754ff780c2072b0b9..5f10e03ba50500f2ccc6af55791990e7f89ace77 100644
--- a/wax-prosemirror-services/src/ListsService/BulletListService/BulletList.js
+++ b/wax-prosemirror-services/src/ListsService/BulletListService/BulletList.js
@@ -25,7 +25,6 @@ class BulletList extends Tools {
   }
 
   select = (state, activeViewId, activeView) => {
-    if (!activeView) return false;
     const {
       selection: { from },
     } = state;
diff --git a/wax-prosemirror-services/src/ListsService/LiftService/Lift.js b/wax-prosemirror-services/src/ListsService/LiftService/Lift.js
index 95b38283906e6bcab7d8d589662d2e9d192e7449..285148f7666d42fc46d3093d5c774e16a81a9299 100644
--- a/wax-prosemirror-services/src/ListsService/LiftService/Lift.js
+++ b/wax-prosemirror-services/src/ListsService/LiftService/Lift.js
@@ -10,7 +10,6 @@ class Lift extends Tools {
   name = 'Lift';
 
   select = (state, activeViewId, activeView) => {
-    if (!activeView) return false;
     const { disallowedTools } = activeView.props;
     if (disallowedTools.includes('lift')) return false;
     return lift(state);
diff --git a/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedList.js b/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedList.js
index a206ee14fd0e64600e21275da84db19009512432..564d67f0466715bbda7e6ab716f7a7f7e0200504 100644
--- a/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedList.js
+++ b/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedList.js
@@ -23,8 +23,6 @@ class OrderedList extends Tools {
   }
 
   select = (state, activeViewId, activeView) => {
-    if (!activeView) return false;
-
     const {
       selection: { from },
     } = state;
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
index 2b0b1853740943823e4e41c7d1af958133b29e02..e5b708061c4b059cb0cc8dfcd2e2e81a8562c41f 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
@@ -66,7 +66,6 @@ class MultipleChoiceQuestion extends Tools {
   }
 
   select = (state, activeView) => {
-    if (!activeView) return false;
     const { disallowedTools } = activeView.props;
     if (disallowedTools.includes('MultipleChoice')) return false;
     let status = true;
diff --git a/wax-prosemirror-services/src/OverlayService/OverlayService.js b/wax-prosemirror-services/src/OverlayService/OverlayService.js
index 6fe46b661d816ff4002ee54a5ab0882104cf4dc4..128917f931e1068b0a9e38f906e8dee749a8abfc 100644
--- a/wax-prosemirror-services/src/OverlayService/OverlayService.js
+++ b/wax-prosemirror-services/src/OverlayService/OverlayService.js
@@ -2,8 +2,6 @@ import Service from '../Service';
 import OverlayComponent from './OverlayComponent';
 
 export default class OverlayService extends Service {
-  boot() {}
-
   register() {
     this.container.bind('CreateOverlay').toFactory(context => {
       return (Component, componentProps, options) => {
diff --git a/wax-prosemirror-services/src/TablesService/InsertTableService/Table.js b/wax-prosemirror-services/src/TablesService/InsertTableService/Table.js
index 75ddd7c5c1fa97d565947abfb5b76284b3f6ce2b..142ed5234bddaf82aaaa260c307c82b080cdcfd6 100644
--- a/wax-prosemirror-services/src/TablesService/InsertTableService/Table.js
+++ b/wax-prosemirror-services/src/TablesService/InsertTableService/Table.js
@@ -20,7 +20,6 @@ class Table extends Tools {
   }
 
   select = activeView => {
-    if (!activeView) return false;
     const {
       selection: { from },
     } = activeView.state;