diff --git a/wax-prosemirror-components/src/components/Button.js b/wax-prosemirror-components/src/components/Button.js
index ed968a69aa5dcd5c0f61011fd9ddeb0cc4a5a4b6..4db7e1c60d08668fa233afbd771b3830425e8469 100644
--- a/wax-prosemirror-components/src/components/Button.js
+++ b/wax-prosemirror-components/src/components/Button.js
@@ -19,7 +19,7 @@ const Button = ({ view = {}, item }) => {
     run(state, dispatch);
   };
 
-  const isActive = active && active(state, activeViewId);
+  const isActive = active && active(state);
 
   const isDisabled =
     enable && !enable(state) && !(select && select(state, activeViewId));
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/Author.js b/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/Author.js
index d622e7606f2dffdb1b337d9428694278f094be1e..8bd7a8564d91f4fd757975d809c2a8a7f08eb636 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/Author.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/Author.js
@@ -17,7 +17,7 @@ class Author extends Tools {
   }
 
   get active() {
-    return (state, activeViewId) => {
+    return state => {
       return Commands.blockActive(state.config.schema.nodes.author)(state);
     };
   }
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetry.js b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetry.js
index fb321b08f5067ab90159316eb7fc6741afe79432..7155f17258e68aaee0598a7430819658f5344a56 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetry.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetry.js
@@ -17,7 +17,7 @@ class EpigraphPoetry extends Tools {
   }
 
   get active() {
-    return (state, activeViewId) => {
+    return state => {
       return Commands.blockActive(state.config.schema.nodes.epigraphPoetry)(
         state,
       );
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProse.js b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProse.js
index 257d3a92237fb88fd13bcc647236d2dbe7836766..365321ad08a3c1a950721f87ced1745bf8a0943f 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProse.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProse.js
@@ -18,7 +18,7 @@ class EpigraphProse extends Tools {
   }
 
   get active() {
-    return (state, activeViewId) => {
+    return state => {
       return Commands.blockActive(state.config.schema.nodes.epigraphProse)(
         state,
       );
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading1.js b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading1.js
index 87c28214f24092f5972751321fec6d8624db95ef..4fed67b7abdf136c76269e1b5963d4a869dce4a5 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading1.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading1.js
@@ -19,7 +19,7 @@ class Heading1 extends Tools {
   }
 
   get active() {
-    return (state, activeViewId) => {
+    return state => {
       return Commands.blockActive(state.config.schema.nodes.heading, {
         level: 1,
       })(state);
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading2.js b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading2.js
index fca907f60faac1607f65fddb2eb02a31e65c4512..d4979cb93a9b0626288256b39e6e4d3d73895da2 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading2.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading2.js
@@ -19,7 +19,7 @@ class Heading2 extends Tools {
   }
 
   get active() {
-    return (state, activeViewId) => {
+    return state => {
       return Commands.blockActive(state.config.schema.nodes.heading, {
         level: 2,
       })(state);
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading3.js b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading3.js
index 682b0fc807b10d7fac96d04282b2501b66b62702..0e198226c19e310df8546bd925b1c92e773650eb 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading3.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading3.js
@@ -19,7 +19,7 @@ class Heading3 extends Tools {
   }
 
   get active() {
-    return (state, activeViewId) => {
+    return state => {
       return Commands.blockActive(state.config.schema.nodes.heading, {
         level: 3,
       })(state);
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitle.js b/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitle.js
index a4fb4795bf4462059be2cb418543bbe282b6486e..17293be671c324d0c75a37d4c659aff9a5895227 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitle.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitle.js
@@ -18,7 +18,7 @@ class SubTitle extends Tools {
   }
 
   get active() {
-    return (state, activeViewId) => {
+    return state => {
       return Commands.blockActive(state.config.schema.nodes.subtitle)(state);
     };
   }
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/Title.js b/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/Title.js
index 0de73d091dbe64302b3c8e7c0bec361e3f78d5b7..6ac176a9ba1525523717920f975d1a725fcaeb61 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/Title.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/Title.js
@@ -18,7 +18,7 @@ class Title extends Tools {
   }
 
   get active() {
-    return (state, activeViewId) => {
+    return state => {
       return Commands.blockActive(state.config.schema.nodes.title)(state);
     };
   }
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetry.js b/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetry.js
index be5fe190666ea5cd2d522dc2d97cc21bc254bca1..c5e8fdfca4080b0a1207d467736b633f5435c7fd 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetry.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetry.js
@@ -22,7 +22,7 @@ class ExtractPoetry extends Tools {
   };
 
   get active() {
-    return (state, activeViewId) => {
+    return state => {
       return Commands.blockActive(state.config.schema.nodes.extractPoetry)(
         state,
       );
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProse.js b/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProse.js
index 7da57142cae3584c8520556d16cdc43e1c6274c6..0760fabbed7f528a3d258e8bd040142eb5375c48 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProse.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProse.js
@@ -17,7 +17,7 @@ class ExtractProse extends Tools {
   }
 
   get active() {
-    return (state, activeViewId) => {
+    return state => {
       return Commands.blockActive(state.config.schema.nodes.extractProse)(
         state,
       );
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinued.js b/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinued.js
index a7437e99ad6e8cdf218db5652490a7a56454ca61..774a432142d337f3126bffe139cac6b2f18744f2 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinued.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinued.js
@@ -17,7 +17,7 @@ class ParagraphContinued extends Tools {
   }
 
   get active() {
-    return (state, activeViewId) => {
+    return state => {
       return Commands.blockActive(state.config.schema.nodes.paragraphCont)(
         state,
       );
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/Paragraph.js b/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/Paragraph.js
index 1b1c6dee6ac186127058d1cb66b55a61a7642fbd..f0ebddd07ba0eb1b59065700874608d400035b4a 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/Paragraph.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/Paragraph.js
@@ -18,7 +18,7 @@ class Paragraph extends Tools {
   }
 
   get active() {
-    return (state, activeViewId) => {
+    return state => {
       return Commands.blockActive(state.config.schema.nodes.paragraph)(state);
     };
   }
diff --git a/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNote.js b/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNote.js
index 9598082252fce76510681edce310608b0f36d9d8..17c67a2789f5edb2f86015c94ed208cf57fd05f0 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNote.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNote.js
@@ -17,7 +17,7 @@ class SourceNote extends Tools {
   }
 
   get active() {
-    return (state, activeViewId) => {
+    return state => {
       return Commands.blockActive(state.config.schema.nodes.sourceNote)(state);
     };
   }