diff --git a/database/elasticsearch/monitors-elasticsearch.tf b/database/elasticsearch/monitors-elasticsearch.tf
index 6be7dae..947d44e 100644
--- a/database/elasticsearch/monitors-elasticsearch.tf
+++ b/database/elasticsearch/monitors-elasticsearch.tf
@@ -7,7 +7,7 @@ resource "datadog_monitor" "not_responding" {
   message = "${coalesce(var.not_responding_message, var.message)}"
 
   query = <<EOL
-    "elasticsearch.can_connect".over${module.filter-tags.service_check}.by("server","port").last(6).count_by_status()
+    "elasticsearch.can_connect"${module.filter-tags.service_check}.by("server","port").last(6).count_by_status()
 EOL
 
   type = "service check"
diff --git a/database/mysql/monitors-mysql.tf b/database/mysql/monitors-mysql.tf
index 82133a1..897b683 100644
--- a/database/mysql/monitors-mysql.tf
+++ b/database/mysql/monitors-mysql.tf
@@ -6,7 +6,7 @@ resource "datadog_monitor" "mysql_availability" {
   type = "service check"
 
   query = <<EOF
-    "mysql.can_connect".over${module.filter-tags.service_check}.by("port","server").last(6).count_by_status()
+    "mysql.can_connect"${module.filter-tags.service_check}.by("port","server").last(6).count_by_status()
   EOF
 
   thresholds = {
diff --git a/database/postgresql/monitors-postgresql.tf b/database/postgresql/monitors-postgresql.tf
index a37ef7a..a7f61ab 100644
--- a/database/postgresql/monitors-postgresql.tf
+++ b/database/postgresql/monitors-postgresql.tf
@@ -6,7 +6,7 @@ resource "datadog_monitor" "postgresql_availability" {
   type = "service check"
 
   query = <<EOF
-    "postgres.can_connect".over${module.filter-tags.service_check}.by("port","server").last(6).count_by_status()
+    "postgres.can_connect"${module.filter-tags.service_check}.by("port","server").last(6).count_by_status()
   EOF
 
   thresholds = {
diff --git a/database/redis/monitors-redis.tf b/database/redis/monitors-redis.tf
index 1ca4c7f..5a4d87a 100644
--- a/database/redis/monitors-redis.tf
+++ b/database/redis/monitors-redis.tf
@@ -9,7 +9,7 @@ resource "datadog_monitor" "not_responding" {
   type = "service check"
 
   query = <<EOF
-    "redis.can_connect".over${module.filter-tags.service_check}.by("redis_host","redis_port").last(6).count_by_status()
+    "redis.can_connect"${module.filter-tags.service_check}.by("redis_host","redis_port").last(6).count_by_status()
   EOF
 
   thresholds {
diff --git a/middleware/apache/monitors-apache.tf b/middleware/apache/monitors-apache.tf
index 1d8a857..a32273c 100644
--- a/middleware/apache/monitors-apache.tf
+++ b/middleware/apache/monitors-apache.tf
@@ -6,7 +6,7 @@ resource "datadog_monitor" "datadog_apache_process" {
   type = "service check"
 
   query = <<EOF
-    "apache.can_connect".over${module.filter-tags.service_check}.by("host","port","server").last(1).pct_by_status()
+    "apache.can_connect"${module.filter-tags.service_check}.by("host","port","server").last(1).pct_by_status()
   EOF
 
   thresholds = {
diff --git a/middleware/nginx/monitors-nginx.tf b/middleware/nginx/monitors-nginx.tf
index 6c66c79..441c975 100644
--- a/middleware/nginx/monitors-nginx.tf
+++ b/middleware/nginx/monitors-nginx.tf
@@ -6,7 +6,7 @@ resource "datadog_monitor" "datadog_nginx_process" {
   type = "service check"
 
   query = <<EOF
-    "nginx.can_connect".over${module.filter-tags.service_check}.by("server","port").last(6).count_by_status()
+    "nginx.can_connect"${module.filter-tags.service_check}.by("server","port").last(6).count_by_status()
   EOF
 
   thresholds = {
diff --git a/middleware/php-fpm/monitors-fpm.tf b/middleware/php-fpm/monitors-fpm.tf
index 50facf9..8e314c5 100644
--- a/middleware/php-fpm/monitors-fpm.tf
+++ b/middleware/php-fpm/monitors-fpm.tf
@@ -6,7 +6,7 @@ resource "datadog_monitor" "php_fpm_connect" {
   type = "service check"
 
   query = <<EOF
-    "php_fpm.can_ping".over${module.filter-tags.service_check}.by("ping_url").last(6).count_by_status()
+    "php_fpm.can_ping"${module.filter-tags.service_check}.by("ping_url").last(6).count_by_status()
   EOF
 
   thresholds = {