diff --git a/editors/editoria/src/config/config.js b/editors/editoria/src/config/config.js
index 95d93f699a2c8a75933248d8bfac8ddc99653c3a..51001e4d3059c36c75746d7213b30bc5eb5d1579 100644
--- a/editors/editoria/src/config/config.js
+++ b/editors/editoria/src/config/config.js
@@ -56,7 +56,7 @@ export default {
 
   PmPlugins: [columnResizing(), tableEditing(), invisibles([hardBreak()])],
 
-  // Always load first CommentsService and LinkService,
+  // Always load first TrackChangeService,
   //as it matters on how PM treats nodes and marks
   services: [
     new TrackChangeService(),
diff --git a/wax-prosemirror-plugins/src/comments/ActiveComment.js b/wax-prosemirror-plugins/src/comments/ActiveComment.js
index aa664d0ad5f075209a2f18ce95c846906197b7b9..fffbe4c03faf9a582f6741f0c4f1fa61f1e3d309 100644
--- a/wax-prosemirror-plugins/src/comments/ActiveComment.js
+++ b/wax-prosemirror-plugins/src/comments/ActiveComment.js
@@ -6,6 +6,8 @@ import { DocumentHelpers } from "wax-prosemirror-utilities";
 const activeComment = new PluginKey("activeComment");
 
 const getComment = state => {
+  if (state.selection.from !== state.selection.to) return;
+
   const commentMark = state.schema.marks["comment"];
   const commentOnSelection = DocumentHelpers.findMark(state, commentMark);
   if (commentOnSelection) {
diff --git a/wax-prosemirror-schema/src/marks/commentMark.js b/wax-prosemirror-schema/src/marks/commentMark.js
index cb155e807f9000758eae465845578af44ebbe3f4..2c2f36a33a6a834ce5e6a675abcb773b8613f239 100644
--- a/wax-prosemirror-schema/src/marks/commentMark.js
+++ b/wax-prosemirror-schema/src/marks/commentMark.js
@@ -6,6 +6,7 @@ const comment = {
     conversation: []
   },
   inclusive: false,
+  excludes: "",
   parseDOM: [
     {
       tag: "span.comment",
diff --git a/wax-prosemirror-services/src/SchemaService/Mark.js b/wax-prosemirror-services/src/SchemaService/Mark.js
index eaa0e99e9dd79d15384c87f72aea9efa8a882e20..95792c19785c69c79f6752666c08fa7ffca6ff84 100644
--- a/wax-prosemirror-services/src/SchemaService/Mark.js
+++ b/wax-prosemirror-services/src/SchemaService/Mark.js
@@ -10,6 +10,7 @@ export default class Mark {
   group = "";
   content = "";
   draggable = false;
+  inclusive = true;
   _attrs = {};
   _parseRules = [];
 
@@ -60,6 +61,7 @@ export default class Mark {
       group: this.group,
       content: this.content,
       draggable: this.draggable,
+      inclusive: this.inclusive,
       attrs: this._attrs,
       parseDOM: this._parseRules.map(rule => rule.combineRules()),
       toDOM: node => {