diff --git a/dist/package-shared/utils/data-fetching/method-crud.js b/dist/package-shared/utils/data-fetching/method-crud.js
index 4d86a02..b4585c1 100644
--- a/dist/package-shared/utils/data-fetching/method-crud.js
+++ b/dist/package-shared/utils/data-fetching/method-crud.js
@@ -20,7 +20,7 @@ const numberfy_1 = __importDefault(require("../numberfy"));
 const crud_1 = __importDefault(require("./crud"));
 function dsqlMethodCrud(_a) {
     return __awaiter(this, arguments, void 0, function* ({ method, tableName, addUser, user, extraData, transformData, existingData, body, query, targetId, sanitize, transformQuery, debug, }) {
-        var _b, _c, _d;
+        var _b, _c;
         let result = {
             success: false,
         };
@@ -87,15 +87,13 @@ function dsqlMethodCrud(_a) {
                     const GET_RESULT = yield (0, crud_1.default)({
                         action: "get",
                         table: tableName,
-                        query: finalQuery && Boolean((_b = Object.keys(finalQuery)) === null || _b === void 0 ? void 0 : _b[0])
-                            ? Object.assign(Object.assign({}, finalQuery), { query: Object.assign(Object.assign({}, finalQuery.query), ((user === null || user === void 0 ? void 0 : user.id) && addUser
-                                    ? {
-                                        [addUser.field]: {
-                                            value: String(user.id),
-                                        },
-                                    }
-                                    : undefined)), limit: LIMIT, offset: OFFSET })
-                            : undefined,
+                        query: Object.assign(Object.assign({}, finalQuery), { query: Object.assign(Object.assign({}, finalQuery === null || finalQuery === void 0 ? void 0 : finalQuery.query), ((user === null || user === void 0 ? void 0 : user.id) && addUser
+                                ? {
+                                    [addUser.field]: {
+                                        value: String(user.id),
+                                    },
+                                }
+                                : undefined)), limit: LIMIT, offset: OFFSET }),
                         sanitize,
                     });
                     result = {
@@ -110,7 +108,7 @@ function dsqlMethodCrud(_a) {
                     const POST_RESULT = yield (0, crud_1.default)({
                         action: "insert",
                         table: tableName,
-                        data: finalData && ((_c = Object.keys(finalData)) === null || _c === void 0 ? void 0 : _c[0])
+                        data: finalData && ((_b = Object.keys(finalData)) === null || _b === void 0 ? void 0 : _b[0])
                             ? finalData
                             : undefined,
                         sanitize,
@@ -126,7 +124,7 @@ function dsqlMethodCrud(_a) {
                     const PUT_RESULT = yield (0, crud_1.default)({
                         action: "update",
                         table: tableName,
-                        data: finalData && ((_d = Object.keys(finalData)) === null || _d === void 0 ? void 0 : _d[0])
+                        data: finalData && ((_c = Object.keys(finalData)) === null || _c === void 0 ? void 0 : _c[0])
                             ? finalData
                             : undefined,
                         targetId,
diff --git a/package-shared/utils/data-fetching/method-crud.ts b/package-shared/utils/data-fetching/method-crud.ts
index cf47a63..95f21da 100644
--- a/package-shared/utils/data-fetching/method-crud.ts
+++ b/package-shared/utils/data-fetching/method-crud.ts
@@ -127,24 +127,21 @@ export default async function dsqlMethodCrud<
                 const GET_RESULT = await dsqlCrud({
                     action: "get",
                     table: tableName,
-                    query:
-                        finalQuery && Boolean(Object.keys(finalQuery)?.[0])
-                            ? ({
-                                  ...finalQuery,
-                                  query: {
-                                      ...finalQuery.query,
-                                      ...(user?.id && addUser
-                                          ? {
-                                                [addUser.field]: {
-                                                    value: String(user.id),
-                                                },
-                                            }
-                                          : undefined),
-                                  },
-                                  limit: LIMIT,
-                                  offset: OFFSET,
-                              } as any)
-                            : undefined,
+                    query: {
+                        ...finalQuery,
+                        query: {
+                            ...finalQuery?.query,
+                            ...(user?.id && addUser
+                                ? {
+                                      [addUser.field]: {
+                                          value: String(user.id),
+                                      },
+                                  }
+                                : undefined),
+                        },
+                        limit: LIMIT,
+                        offset: OFFSET,
+                    } as any,
                     sanitize,
                 });
 
diff --git a/package.json b/package.json
index 2cd30d9..9fc931c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@moduletrace/datasquirel",
-    "version": "4.0.3",
+    "version": "4.0.4",
     "description": "Cloud-based SQL data management tool",
     "main": "dist/index.js",
     "bin": {