diff --git a/README.md b/README.md
index f68e289..1be1b5e 100644
--- a/README.md
+++ b/README.md
@@ -198,3 +198,4 @@ all supported platforms.
 * The role aims to be idempotent.  Running the role multiple times, with no changes, should result in no state change on the server.  If the configuration is changed, these will be applied and 
 Elasticsearch restarted where required.
 * Systemd is used for Ubuntu versions >= 15, Debian >=8, Centos >=7.  All other versions use init for service scripts.
+
diff --git a/handlers/main.yml b/handlers/main.yml
index cec97f9..45f8a83 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,4 +1,4 @@
 
 - name: restart elasticsearch
   service: name={{instance_init_script | basename}} state=restarted enabled=yes
-  when: es_start_service and (not elasticsearch_started.changed or plugin_installed.changed)
\ No newline at end of file
+  when: es_start_service and (not elasticsearch_started.changed or (plugin_installed is defined and plugin_installed.changed))
\ No newline at end of file
diff --git a/tasks/elasticsearch-templates.yml b/tasks/elasticsearch-templates.yml
index 3033e73..1bcfd71 100644
--- a/tasks/elasticsearch-templates.yml
+++ b/tasks/elasticsearch-templates.yml
@@ -1,6 +1,5 @@
 ---
-#TODO: How to handle in multi node
-# 1. Template directory needs to be specifiable
+
 - name: Copy templates to elasticsearch
   copy: src=templates dest=/etc/elasticsearch/ owner={{ es_user }} group={{ es_group }}
 
diff --git a/tasks/main.yml b/tasks/main.yml
index 9fbd329..e835795 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -10,4 +10,5 @@
 - include: elasticsearch-scripts.yml
   when: es_scripts
 - include: elasticsearch-templates.yml
-  when: es_templates
\ No newline at end of file
+  when: es_templates
+- meta: flush_handlers
\ No newline at end of file