diff --git a/system/unreachable/inputs.tf b/system/unreachable/inputs.tf
index ca98b4e..fc5aae1 100644
--- a/system/unreachable/inputs.tf
+++ b/system/unreachable/inputs.tf
@@ -29,6 +29,11 @@ variable "filter_tags_custom" {
   default     = "*"
 }
 
+variable "filter_tags_custom_excluded" {
+  description = "Tags excluded for custom filtering when filter_tags_use_defaults is false"
+  default     = ""
+}
+
 # Unreachable
 
 variable "unreachable_silenced" {
diff --git a/system/unreachable/modules.tf b/system/unreachable/modules.tf
index 1c03eb2..88e7915 100644
--- a/system/unreachable/modules.tf
+++ b/system/unreachable/modules.tf
@@ -5,4 +5,5 @@ module "filter-tags" {
   resource                 = "system"
   filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
   filter_tags_custom       = "${var.filter_tags_custom}"
+  filter_tags_custom_excluded       = "${var.filter_tags_custom_excluded}"
 }
diff --git a/system/unreachable/monitors-unreachable.tf b/system/unreachable/monitors-unreachable.tf
index c032dfb..9f1699a 100644
--- a/system/unreachable/monitors-unreachable.tf
+++ b/system/unreachable/monitors-unreachable.tf
@@ -3,7 +3,7 @@ resource "datadog_monitor" "host_unreachable" {
   name    = "[${var.environment}] Host unreachable"
   message = "${coalesce(var.unreachable_message, var.message)}"
 
-  query = "\"datadog.agent.up\".over${module.filter-tags.service_check}.last(6).count_by_status()"
+  query = "\"datadog.agent.up\"${module.filter-tags.service_check}.last(6).count_by_status()"
 
   type = "service check"