diff --git a/dist-lib/filters/decorators/resolver.decorator.d.ts b/dist-lib/filters/decorators/resolver.decorator.d.ts
index 86c3941..f1561a9 100644
--- a/dist-lib/filters/decorators/resolver.decorator.d.ts
+++ b/dist-lib/filters/decorators/resolver.decorator.d.ts
@@ -18,5 +18,5 @@ export interface FilterArgs extends Brackets {
 export declare class FilterPipe implements PipeTransform {
     readonly args: IFilterPipeArgs;
     constructor(args: IFilterPipeArgs);
-    transform(value: any, _metadata: ArgumentMetadata): Brackets | import("../input-type-generator").IFilter<unknown>;
+    transform(value: any, _metadata: ArgumentMetadata): Brackets | import("../input-type-generator").IFilter<unknown>[];
 }
diff --git a/dist-lib/filters/decorators/resolver.decorator.js b/dist-lib/filters/decorators/resolver.decorator.js
index 9441ed4..9dcf521 100644
--- a/dist-lib/filters/decorators/resolver.decorator.js
+++ b/dist-lib/filters/decorators/resolver.decorator.js
@@ -60,7 +60,11 @@ let FilterPipe = class FilterPipe {
         this.args = args;
     }
     transform(value, _metadata) {
-        return (0, query_builder_1.convertFilterParameters)(value, this.args.customFields, this.args.options);
+        let params = value;
+        if (!Array.isArray(value)) {
+            params = [value];
+        }
+        return (0, query_builder_1.convertFilterParameters)(params, query_builder_1.EOperationType.AND, this.args.customFields, this.args.options);
     }
 };
 exports.FilterPipe = FilterPipe;
diff --git a/dist-lib/filters/decorators/resolver.decorator.js.map b/dist-lib/filters/decorators/resolver.decorator.js.map
index ec8429a..86586e6 100644
--- a/dist-lib/filters/decorators/resolver.decorator.js.map
+++ b/dist-lib/filters/decorators/resolver.decorator.js.map
@@ -1 +1 @@
-{"version":3,"file":"resolver.decorator.js","sourceRoot":"","sources":["../../../lib/filters/decorators/resolver.decorator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA6E;AAC7E,6CAAuC;AAGvC,qDAAoD;AACpD,4CAA2E;AAC3E,kEAAiE;AACjE,oDAA2D;AAYpD,MAAM,aAAa,GAAG,GAAG,EAAE;IAChC,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE;IAOxC,CAAC,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,aAAa,iBASxB;AAKK,MAAM,MAAM,GAAG,CAAC,UAA2C,EAAE,OAAgC,EAAE,EAAE;IACtG,OAAO,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE;QAC1C,MAAM,IAAI,GAAG,GAAG,IAAA,uBAAW,EAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,IAAA,uBAAW,EAAC,YAAY,CAAC,EAAE,CAAC;QAEpF,MAAM,gBAAgB,GAAG,UAAU,EAAE,CAAC;QACtC,IAAI,aAAa,GAAG,gBAAgC,CAAC;QACrD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACrC,aAAa,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACrC,CAAC;QACD,MAAM,cAAc,GAAG,IAAA,6CAAsB,EAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAInE,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;YACxD,MAAM,gBAAgB,GAAuC,OAAO,CAAC,WAAW,CAAC,uDAA2C,EAAE,MAAM,CAAC,SAAS,CAAC,CAAA;YAC/I,IAAI,gBAAgB,EAAE,CAAC;gBACrB,KAAK,MAAM,KAAK,IAAI,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;oBACrD,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;gBAC5B,CAAC;YACH,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,IAAI,GAAG,EAAsC,CAAC,CAAC;QAElD,OAAO,CAAC,cAAc,CAAC,uDAA2C,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;QAExG,MAAM,KAAK,GAAoB,EAAE,CAAC;QAElC,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,CAAA,EAAE,CAAC;YAClB,KAAK,CAAC,IAAI,CACR,IAAI,UAAU,CAAC;gBACb,OAAO;gBACP,YAAY;aACb,CAAC,CACH,CAAA;QACH,CAAC;QAED,IAAA,cAAI,EACF;YACE,IAAI,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,KAAI,OAAO;YAC9B,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,GAAG,EAAE,CAAC,cAAc;SAC3B,EACD,GAAG,KAAK,CACT,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IACtC,CAAC,CAAA;AACH,CAAC,CAAA;AA7CY,QAAA,MAAM,UA6ClB;AAUM,IAAM,UAAU,GAAhB,MAAM,UAAU;IACrB,YAA4B,IAAqB;QAArB,SAAI,GAAJ,IAAI,CAAiB;IAAG,CAAC;IACrD,SAAS,CAAC,KAAU,EAAE,SAA2B;QAC/C,OAAO,IAAA,uCAAuB,EAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACnF,CAAC;CACF,CAAA;AALY,gCAAU;qBAAV,UAAU;IADtB,IAAA,mBAAU,GAAE;;GACA,UAAU,CAKtB"}
\ No newline at end of file
+{"version":3,"file":"resolver.decorator.js","sourceRoot":"","sources":["../../../lib/filters/decorators/resolver.decorator.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/dist-lib/filters/input-type-generator.d.ts b/dist-lib/filters/input-type-generator.d.ts
index 653c82d..8bfc47c 100644
--- a/dist-lib/filters/input-type-generator.d.ts
+++ b/dist-lib/filters/input-type-generator.d.ts
@@ -31,10 +31,10 @@ export type IFilterField<T> = {
         null: T[K];
     };
 };
-export interface IFilter<T> {
-    and: IFilterField<T>[];
-    or: IFilterField<T>[];
-}
+export type IFilter<T> = {
+    and?: IFilter<T>[];
+    or?: IFilter<T>[];
+} & IFilterField<T>;
 export type RawFilterArgs<T> = IFilter<T> & IFilterField<T>;
 export declare enum InputMapPrefixes {
     PropertyFilterInputType = "PropertyFilterInputType",
diff --git a/dist-lib/filters/input-type-generator.js b/dist-lib/filters/input-type-generator.js
index 903c8b5..6c2c3f7 100644
--- a/dist-lib/filters/input-type-generator.js
+++ b/dist-lib/filters/input-type-generator.js
@@ -155,18 +155,32 @@ function generateFilterInputType(classes, name) {
 }
 const getFilterFullInputType = (classes, name) => {
     const key = `${name}_FilterInputType`;
+    const baseKey = `${name}_BaseFilterInputType`;
     if (filterFullTypes.get(key)) {
         return filterFullTypes.get(key);
     }
     const FilterInputType = generateFilterInputType(classes, name);
+    let BaseEntityInput = class BaseEntityInput extends FilterInputType {
+    };
+    __decorate([
+        (0, graphql_1.Field)(() => [BaseEntityInput], { nullable: true }),
+        __metadata("design:type", Array)
+    ], BaseEntityInput.prototype, "and", void 0);
+    __decorate([
+        (0, graphql_1.Field)(() => [BaseEntityInput], { nullable: true }),
+        __metadata("design:type", Array)
+    ], BaseEntityInput.prototype, "or", void 0);
+    BaseEntityInput = __decorate([
+        (0, graphql_1.InputType)(baseKey)
+    ], BaseEntityInput);
     let EntityWhereInput = class EntityWhereInput extends FilterInputType {
     };
     __decorate([
-        (0, graphql_1.Field)(() => [FilterInputType], { nullable: true }),
+        (0, graphql_1.Field)(() => [BaseEntityInput], { nullable: true }),
         __metadata("design:type", Array)
     ], EntityWhereInput.prototype, "and", void 0);
     __decorate([
-        (0, graphql_1.Field)(() => [FilterInputType], { nullable: true }),
+        (0, graphql_1.Field)(() => [BaseEntityInput], { nullable: true }),
         __metadata("design:type", Array)
     ], EntityWhereInput.prototype, "or", void 0);
     EntityWhereInput = __decorate([
diff --git a/dist-lib/filters/input-type-generator.js.map b/dist-lib/filters/input-type-generator.js.map
index e6ac8d7..4a06aad 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/dist-lib/filters/query.builder.d.ts b/dist-lib/filters/query.builder.d.ts
index b3c5ff4..1e9f77a 100644
--- a/dist-lib/filters/query.builder.d.ts
+++ b/dist-lib/filters/query.builder.d.ts
@@ -2,4 +2,8 @@ import { Brackets } from "typeorm";
 import { GraphqlFilterFieldMetadata } from "./decorators/field.decorator";
 import { IFilterDecoratorParams } from "./decorators/resolver.decorator";
 import { IFilter } from "./input-type-generator";
-export declare const convertFilterParameters: <T>(parameters?: IFilter<T>, customFields?: Map<string, GraphqlFilterFieldMetadata>, options?: IFilterDecoratorParams) => Brackets | IFilter<T>;
+export declare enum EOperationType {
+    AND = 0,
+    OR = 1
+}
+export declare const convertFilterParameters: <T>(parameters?: IFilter<T>[], opType?: EOperationType, customFields?: Map<string, GraphqlFilterFieldMetadata>, options?: IFilterDecoratorParams) => Brackets | IFilter<T>[];
diff --git a/dist-lib/filters/query.builder.js b/dist-lib/filters/query.builder.js
index e0174ae..e48c032 100644
--- a/dist-lib/filters/query.builder.js
+++ b/dist-lib/filters/query.builder.js
@@ -1,51 +1,49 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertFilterParameters = void 0;
+exports.convertFilterParameters = exports.EOperationType = void 0;
 const typeorm_1 = require("typeorm");
 const functions_1 = require("../utils/functions");
 const constants_1 = require("./constants");
 const input_type_generator_1 = require("./input-type-generator");
-const convertFilterParameters = (parameters, customFields, options) => {
+var EOperationType;
+(function (EOperationType) {
+    EOperationType[EOperationType["AND"] = 0] = "AND";
+    EOperationType[EOperationType["OR"] = 1] = "OR";
+})(EOperationType || (exports.EOperationType = EOperationType = {}));
+const convertFilterParameters = (parameters, opType = EOperationType.AND, customFields, options) => {
     if (parameters === null || parameters === void 0 ? void 0 : parameters.whereFactory)
         return parameters;
     return new typeorm_1.Brackets((qb) => {
         if (parameters == null) {
             return;
         }
-        const clonnedParams = Object.assign({}, parameters);
-        delete clonnedParams.and;
-        delete clonnedParams.or;
-        if (parameters === null || parameters === void 0 ? void 0 : parameters.and) {
-            qb.andWhere(new typeorm_1.Brackets((andBracketsQb) => {
-                for (const op of parameters === null || parameters === void 0 ? void 0 : parameters.and) {
-                    const andParameters = recursivelyTransformComparators(op, customFields, options === null || options === void 0 ? void 0 : options.sqlAlias);
-                    if (andParameters === null || andParameters === void 0 ? void 0 : andParameters.length) {
-                        for (const query of andParameters) {
-                            andBracketsQb.andWhere(query[0], query[1]);
-                        }
-                    }
+        for (const op of parameters) {
+            if (op.and) {
+                const innerBrackets = (0, exports.convertFilterParameters)(op.and, EOperationType.AND, customFields, options);
+                if (innerBrackets instanceof typeorm_1.Brackets) {
+                    qb.andWhere(innerBrackets);
                 }
-            }));
-        }
-        if (parameters === null || parameters === void 0 ? void 0 : parameters.or) {
-            qb.orWhere(new typeorm_1.Brackets((orBracketsQb) => {
-                for (const op of parameters === null || parameters === void 0 ? void 0 : parameters.or) {
-                    const orParameters = recursivelyTransformComparators(op, customFields, options === null || options === void 0 ? void 0 : options.sqlAlias);
-                    if (orParameters === null || orParameters === void 0 ? void 0 : orParameters.length) {
-                        for (const query of orParameters) {
-                            orBracketsQb.orWhere(query[0], query[1]);
-                        }
-                    }
+            }
+            if (op.or) {
+                const innerBrackets = (0, exports.convertFilterParameters)(op.or, EOperationType.OR, customFields, options);
+                if (innerBrackets instanceof typeorm_1.Brackets) {
+                    qb.orWhere(innerBrackets);
                 }
-            }));
-        }
-        const basicParameters = recursivelyTransformComparators(clonnedParams, customFields, options === null || options === void 0 ? void 0 : options.sqlAlias);
-        if (basicParameters) {
-            qb.andWhere(new typeorm_1.Brackets((basicParametersQb) => {
+            }
+            const clonnedOp = Object.assign({}, op);
+            delete clonnedOp.and;
+            delete clonnedOp.or;
+            const basicParameters = recursivelyTransformComparators(clonnedOp, customFields, options === null || options === void 0 ? void 0 : options.sqlAlias);
+            if (basicParameters) {
                 for (const query of basicParameters) {
-                    basicParametersQb.andWhere(query[0], query[1]);
+                    if (opType === EOperationType.AND) {
+                        qb.andWhere(query[0], query[1]);
+                    }
+                    else {
+                        qb.orWhere(query[0], query[1]);
+                    }
                 }
-            }));
+            }
         }
     });
 };
@@ -78,7 +76,7 @@ const recursivelyTransformComparators = (object, extendedParams, sqlAlias) => {
 };
 const buildSqlArgument = (operatorKey, field, value) => {
     let result = [];
-    const argName = `arg_${(0, functions_1.convertArrayOfStringIntoStringNumber)([field])}`;
+    const argName = `arg_${(0, functions_1.convertArrayOfStringIntoStringNumber)([field])}_${Math.floor(Math.random() * 1e6)}`;
     if (operatorKey === input_type_generator_1.OperationQuery.eq) {
         if (value === null || value === 'null') {
             result = [`${field} is null`];
diff --git a/dist-lib/filters/query.builder.js.map b/dist-lib/filters/query.builder.js.map
index ac81c0f..e544574 100644
--- a/dist-lib/filters/query.builder.js.map
+++ b/dist-lib/filters/query.builder.js.map
@@ -1 +1 @@
-{"version":3,"file":"query.builder.js","sourceRoot":"","sources":["../../lib/filters/query.builder.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"query.builder.js","sourceRoot":"","sources":["../../lib/filters/query.builder.ts"],"names":[],"mappings":"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"}
\ No newline at end of file