diff --git a/cloud/azure/eventhub/monitors-eventhub.tf b/cloud/azure/eventhub/monitors-eventhub.tf
index 71b97b3..2b67590 100644
--- a/cloud/azure/eventhub/monitors-eventhub.tf
+++ b/cloud/azure/eventhub/monitors-eventhub.tf
@@ -12,7 +12,7 @@ resource "datadog_monitor" "eventhub_status" {
   message = "${var.down_message}"
 
   query = <<EOF
-      avg(last_5m): avg:azure.eventhub_namespaces.status{${data.template_file.filter.rendered} by {name,resource_group,region} != 1
+      avg(last_5m): avg:azure.eventhub_namespaces.status{${data.template_file.filter.rendered}} by {name,resource_group,region} != 1
       EOF
   type  = "query alert"
 
@@ -34,10 +34,10 @@ resource "datadog_monitor" "eventhub_failed_requests" {
 
   query = <<EOF
         avg(last_5m): (
-          avg:azure.eventhub_namespaces.failed_requests{${data.template_file.filter.rendered} by {name,resource_group,region}
+          avg:azure.eventhub_namespaces.failed_requests{${data.template_file.filter.rendered}} by {name,resource_group,region}
         ) * 100 / (
-          avg:azure.eventhub_namespaces.successful_requests{${data.template_file.filter.rendered} by {name,resource_group,region} +
-          avg:azure.eventhub_namespaces.failed_requests{${data.template_file.filter.rendered} by {name,resource_group,region}
+          avg:azure.eventhub_namespaces.successful_requests{${data.template_file.filter.rendered}} by {name,resource_group,region} +
+          avg:azure.eventhub_namespaces.failed_requests{${data.template_file.filter.rendered}} by {name,resource_group,region}
         ) > ${var.failed_requests_rate_thresold_critical}
         EOF
   type  = "query alert"
@@ -65,14 +65,14 @@ resource "datadog_monitor" "eventhub_errors" {
 
   query = <<EOF
         avg(last_5m): (
-          avg:azure.eventhub_namespaces.internal_server_errors{${data.template_file.filter.rendered} by {name,resource_group,region} +
-          avg:azure.eventhub_namespaces.server_busy_errors{${data.template_file.filter.rendered} by {name,resource_group,region} +
-          avg:azure.eventhub_namespaces.other_errors{${data.template_file.filter.rendered} by {name,resource_group,region}
+          avg:azure.eventhub_namespaces.internal_server_errors{${data.template_file.filter.rendered}} by {name,resource_group,region} +
+          avg:azure.eventhub_namespaces.server_busy_errors{${data.template_file.filter.rendered}} by {name,resource_group,region} +
+          avg:azure.eventhub_namespaces.other_errors{${data.template_file.filter.rendered}} by {name,resource_group,region}
         ) * 100 / (
-          avg:azure.eventhub_namespaces.successful_requests{${data.template_file.filter.rendered} by {name,resource_group,region} +
-          avg:azure.eventhub_namespaces.internal_server_errors{${data.template_file.filter.rendered} by {name,resource_group,region} +
-          avg:azure.eventhub_namespaces.server_busy_errors{${data.template_file.filter.rendered} by {name,resource_group,region} +
-          avg:azure.eventhub_namespaces.other_errors{${data.template_file.filter.rendered} by {name,resource_group,region}
+          avg:azure.eventhub_namespaces.successful_requests{${data.template_file.filter.rendered}} by {name,resource_group,region} +
+          avg:azure.eventhub_namespaces.internal_server_errors{${data.template_file.filter.rendered}} by {name,resource_group,region} +
+          avg:azure.eventhub_namespaces.server_busy_errors{${data.template_file.filter.rendered}} by {name,resource_group,region} +
+          avg:azure.eventhub_namespaces.other_errors{${data.template_file.filter.rendered}} by {name,resource_group,region}
         ) > ${var.errors_rate_thresold_critical}
         EOF
   type  = "query alert"