diff --git a/controller/schema/dgraph_schema_store.go b/controller/schema/dgraph_schema_store.go
index a9add2e..1680af0 100644
--- a/controller/schema/dgraph_schema_store.go
+++ b/controller/schema/dgraph_schema_store.go
@@ -269,9 +269,13 @@
 		for _, c := range v.Children {
 			rewriteValue(c.Value, s)
 		}
+		// TODO(giolekva): explicitly get input argument and rewrite only that part.
 		if v.Definition.Kind == ast.InputObject &&
 			!strings.HasSuffix(v.Definition.Name, "Event") &&
-			!strings.HasSuffix(v.Definition.Name, "Ref") {
+			!strings.HasSuffix(v.Definition.Name, "EventInput") &&
+			!strings.HasSuffix(v.Definition.Name, "Ref") &&
+			!strings.HasSuffix(v.Definition.Name, "Filter") &&
+			!strings.HasSuffix(v.Definition.Name, "Patch") {
 			v.Children = append(v.Children, newEventListValue(v.Definition, s))
 		}
 	}