diff --git a/dist-lib/filters/input-type-generator.js b/dist-lib/filters/input-type-generator.js
index ec46b52..c1692a8 100644
--- a/dist-lib/filters/input-type-generator.js
+++ b/dist-lib/filters/input-type-generator.js
@@ -39,8 +39,10 @@ var InputMapPrefixes;
 const filterFullTypes = new Map();
 const filterTypes = new Map();
 const propertyTypes = new Map();
-const generateFilterPropertyType = (field, parentName) => {
-    const key = `${(0, functions_1.standardize)(field.name)}_${parentName}_${InputMapPrefixes.PropertyFilterInputType}`;
+const generateFilterPropertyType = (field) => {
+    var _a;
+    const typeName = field.typeFn && ((_a = field.typeFn()) === null || _a === void 0 ? void 0 : _a.name);
+    const key = `${(0, functions_1.standardize)(typeName)}_${InputMapPrefixes.PropertyFilterInputType}`;
     const propType = propertyTypes.get(key);
     if (propType)
         return propType;
@@ -115,7 +117,7 @@ function generateFilterInputType(classes, name) {
             if (typeof field.typeFn === 'function') {
                 field.typeFn();
             }
-            const fieldType = generateFilterPropertyType(field, name);
+            const fieldType = generateFilterPropertyType(field);
             (0, graphql_1.Field)(() => fieldType, { nullable: true })(PartialObjectType.prototype, field.name);
         }
         else {
diff --git a/dist-lib/filters/input-type-generator.js.map b/dist-lib/filters/input-type-generator.js.map
index ea246d2..2d0e911 100644
--- a/dist-lib/filters/input-type-generator.js.map
+++ b/dist-lib/filters/input-type-generator.js.map
@@ -1 +1 @@
-{"version":3,"file":"input-type-generator.js","sourceRoot":"","sources":["../../lib/filters/input-type-generator.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"input-type-generator.js","sourceRoot":"","sources":["../../lib/filters/input-type-generator.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/lib/filters/input-type-generator.ts b/lib/filters/input-type-generator.ts
index edc034b..c892b88 100644
--- a/lib/filters/input-type-generator.ts
+++ b/lib/filters/input-type-generator.ts
@@ -47,8 +47,9 @@ const filterFullTypes = new Map();
 const filterTypes = new Map();
 const propertyTypes = new Map()
 
-const generateFilterPropertyType = (field, parentName: string) => {
-  const key = `${standardize(field.name)}_${parentName}_${InputMapPrefixes.PropertyFilterInputType}`;
+const generateFilterPropertyType = (field) => {
+  const typeName = field.typeFn && field.typeFn()?.name;
+  const key = `${standardize(typeName)}_${InputMapPrefixes.PropertyFilterInputType}`;
 
   const propType = propertyTypes.get(key);
   if (propType) return propType;
@@ -138,7 +139,7 @@ function generateFilterInputType<T extends BaseEntity>(classes: T[], name: strin
       if (typeof field.typeFn === 'function') {
         field.typeFn();
       }
-      const fieldType = generateFilterPropertyType(field, name);
+      const fieldType = generateFilterPropertyType(field);
       Field(() => fieldType, {nullable: true})(PartialObjectType.prototype, field.name)
     } else {
       // Relations are not supported yet