diff --git a/blueprints/editor-plugin/files/addon/components/editor-plugins/__name__-card.js b/blueprints/editor-plugin/files/addon/components/editor-plugins/__name__-card.js
index 7d37213..58a8777 100644
--- a/blueprints/editor-plugin/files/addon/components/editor-plugins/__name__-card.js
+++ b/blueprints/editor-plugin/files/addon/components/editor-plugins/__name__-card.js
@@ -46,8 +46,8 @@ export default Component.extend({
 
   actions: {
     insert(){
-      let mappedLocation = this.get('hintsRegistry').updateLocationToCurrentIndex(this.get('hrId'), this.get('location'));
       this.get('hintsRegistry').removeHintsAtLocation(this.get('location'), this.get('hrId'), 'editor-plugins/<%= dasherizedModuleName %>-card');
+      const mappedLocation = this.get('hintsRegistry').updateLocationToCurrentIndex(this.get('hrId'), this.get('location'));
       this.get('editor').replaceTextWithHTML(...mappedLocation, this.get('info').htmlString);
     }
   }
diff --git a/blueprints/editor-plugin/files/addon/services/rdfa-editor-__name__-plugin.js b/blueprints/editor-plugin/files/addon/services/rdfa-editor-__name__-plugin.js
index 44847f7..9566b61 100644
--- a/blueprints/editor-plugin/files/addon/services/rdfa-editor-__name__-plugin.js
+++ b/blueprints/editor-plugin/files/addon/services/rdfa-editor-__name__-plugin.js
@@ -19,7 +19,7 @@ const RdfaEditor<%= classifiedModuleName %>Plugin = Service.extend({
   },
 
   /**
-   * Restartable task to handle the incoming events from the editor dispatcher
+   * task to handle the incoming events from the editor dispatcher
    *
    * @method execute
    *
@@ -45,7 +45,7 @@ const RdfaEditor<%= classifiedModuleName %>Plugin = Service.extend({
     if(cards.length > 0){
       hintsRegistry.addHints(hrId, this.get('who'), cards);
     }
-  }).restartable(),
+  }),
 
   /**
    * Given context object, tries to detect a context the plugin can work on