diff --git a/macros/decoder/decoded_traces_history.sql b/macros/decoder/decoded_traces_history.sql
index 8a99d946..c6ee087e 100644
--- a/macros/decoder/decoded_traces_history.sql
+++ b/macros/decoder/decoded_traces_history.sql
@@ -126,11 +126,7 @@
                                 from_address,
                                 to_address,
                                 TYPE,
-                                REGEXP_REPLACE(
-                                    identifier,
-                                    '[A-Z]+_',
-                                    ''
-                                ) AS trace_address,
+                                trace_address,
                                 sub_traces,
                                 CASE
                                     WHEN sub_traces > 0
diff --git a/models/gold/core/core__ez_balance_deltas.sql b/models/gold/core/core__ez_balance_deltas.sql
index aa75456e..c9b81c48 100644
--- a/models/gold/core/core__ez_balance_deltas.sql
+++ b/models/gold/core/core__ez_balance_deltas.sql
@@ -157,7 +157,7 @@ FROM
         tb.block_timestamp
     ) = tp.hour
     AND tp.token_address = tb.contract_address
-    LEFT JOIN {{ ref("silver__contracts") }} C
+    LEFT JOIN {{ ref("core__dim_contracts") }} C
     ON tb.contract_address = LOWER(
         C.address
     )
diff --git a/models/streamline/silver/decoder/decoded_traces/realtime/streamline__decode_traces_realtime.sql b/models/streamline/silver/decoder/decoded_traces/realtime/streamline__decode_traces_realtime.sql
index 590c623d..b31b8b94 100644
--- a/models/streamline/silver/decoder/decoded_traces/realtime/streamline__decode_traces_realtime.sql
+++ b/models/streamline/silver/decoder/decoded_traces/realtime/streamline__decode_traces_realtime.sql
@@ -26,11 +26,8 @@ WITH look_back AS (
             from_address,
             to_address,
             TYPE,
-            REGEXP_REPLACE(
-                identifier,
-                '[A-Z]+_',
-                ''
-            ) AS trace_address,
+            CONCAT(type,'_',trace_address) AS identifier,
+            trace_address,
             sub_traces,
             CASE
                 WHEN sub_traces > 0
@@ -47,7 +44,7 @@ WITH look_back AS (
                 '-',
                 t.block_number,
                 t.tx_position,
-                t.identifier
+                identifier
             ) AS _call_id
         FROM
             {{ ref("core__fact_traces") }}