diff --git a/nifi/sql/load/05_dim_organization.sql b/nifi/sql/load/05_dim_organization.sql
index 3a4f809..09e63a0 100644
--- a/nifi/sql/load/05_dim_organization.sql
+++ b/nifi/sql/load/05_dim_organization.sql
@@ -2,9 +2,9 @@ INSERT INTO DIM_ORGANIZATION (org_id, name, region, country, club_partner_status
 VALUES (
     ${organization_id},
     '${name}',
-    ${region:isEmpty():ifElse('NULL', concat("'", ${region}, "'"))},
-    ${country:isEmpty():ifElse('NULL', concat("'", ${country}, "'"))},
-    ${club_partner_status:isEmpty():ifElse('NULL', concat("'", ${club_partner_status}, "'"))},
-    ${founded_year:isEmpty():ifElse('NULL', ${founded_year})},
-    ${social_media_followers_m:isEmpty():ifElse('NULL', ${social_media_followers_m})}
+    NULLIF('${region}', ''),
+    NULLIF('${country}', ''),
+    NULLIF('${club_partner_status}', ''),
+    TO_NUMBER(NULLIF('${founded_year}', '')),
+    TO_NUMBER(NULLIF('${social_media_followers_m}', ''))
 )