diff --git a/editors/demo/src/Editors.js b/editors/demo/src/Editors.js
index 1e839e3d33a7e73e494ec5a4903e8c7fa669e16d..166168897656c1d73e46585d9f7a08e372190219 100644
--- a/editors/demo/src/Editors.js
+++ b/editors/demo/src/Editors.js
@@ -70,7 +70,7 @@ const Editors = () => {
       case 'ncbi':
         return <NCBI />;
       default:
-        return <HHMI />;
+        return <Editoria />;
     }
   };
 
diff --git a/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js b/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js
index f6d53cd6c440d354209ac2652db575b2c4804bd8..e2dc16247ea87c01cced3bd8f0e930183a5f568f 100644
--- a/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js
+++ b/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js
@@ -152,7 +152,7 @@ export default ({ node, view, getPos }) => {
         );
       }
     });
-  }, [options, context]);
+  }, [options, JSON.stringify(context.pmViews.main.state)]);
 
   const addOption = () => {
     if (addOptionRef.current.value.trim() === '') return;