diff --git a/dbt_project.yml b/dbt_project.yml
index c61018c0..c7b8ac88 100644
--- a/dbt_project.yml
+++ b/dbt_project.yml
@@ -1,5 +1,5 @@
 name: 'ga4'
-version: '0.1.4'
+version: '2.0.1'
 config-version: 2
 model-paths: ["models"]
 analysis-paths: ["analyses"]
diff --git a/models/staging/ga4/stg_ga4__events.sql b/models/staging/ga4/stg_ga4__events.sql
index f3c523da..7ac00b3b 100644
--- a/models/staging/ga4/stg_ga4__events.sql
+++ b/models/staging/ga4/stg_ga4__events.sql
@@ -41,13 +41,17 @@ include_event_key as (
 ),
 detect_gclid as (
     select
-        * except (medium, campaign),
+        * except (source, medium, campaign),
         case
-            when page_location like '%gclid%' then "cpc"
+            when (page_location like '%gclid%' and source is null) then "google"
+            else source
+        end as source,
+        case
+            when (page_location like '%gclid%' and medium is null) then "cpc"
             else medium
         end as medium,
         case
-            when page_location like '%gclid%' then "(cpc)"
+            when (page_location like '%gclid%' and campaign is null) then "(cpc)"
             else campaign
         end as campaign
     from include_event_key