diff --git a/definitions/staging/stg_agent_status.sqlx b/definitions/staging/stg_agent_status.sqlx
index 7a4dab0..826d139 100644
--- a/definitions/staging/stg_agent_status.sqlx
+++ b/definitions/staging/stg_agent_status.sqlx
@@ -19,6 +19,8 @@ select  *,
 from ${ref("pphe_five9_raw","agent_status_*")}
 ${ when(incremental(), `where _TABLE_SUFFIX = FORMAT_DATE('%Y%m%d',current_date("Europe/Amsterdam"))`) }) --last date table is taken
 select  AGENT_ID,
+        AGENT_NAME,
+        AGENT_GROUP,
         AGENT_STATE_TIME,
         AGENT_START_DATE,
         REASON_CODE,
diff --git a/definitions/staging/stg_agent_status_history_report.sqlx b/definitions/staging/stg_agent_status_history_report.sqlx
index 98c72e0..062eeae 100644
--- a/definitions/staging/stg_agent_status_history_report.sqlx
+++ b/definitions/staging/stg_agent_status_history_report.sqlx
@@ -15,8 +15,8 @@ config {
 
 --Extraction and transformation of fields that are used in Board load further. Contains all history data
 select  ags.AGENT_ID,
-        COALESCE(a.AGENT_NAME, 'NOT_MAPPED') as AGENT_NAME,
-        COALESCE(a.AGENT_GROUP, 'NOT_MAPPED') as AGENT_GROUP,
+        ags.AGENT_NAME,
+        ags.AGENT_GROUP,
         COALESCE(a.AGENT_GROUP_ID, 0) as AGENT_GROUP_ID,
         COALESCE(a.LANGUAGES, 'NOT_MAPPED') as LANGUAGES,
         COALESCE(a.CODE, 'NOT_MAPPED') as LANG_CODE,
diff --git a/definitions/staging/stg_agent_status_report.sqlx b/definitions/staging/stg_agent_status_report.sqlx
index 5a8f2f1..cd2ec09 100644
--- a/definitions/staging/stg_agent_status_report.sqlx
+++ b/definitions/staging/stg_agent_status_report.sqlx
@@ -6,7 +6,6 @@ config {
     uniqueKey: ["AGENT_ID", "TIMESTAMP", "STATE"],
     nonNull: ["AGENT_ID", "TIMESTAMP", "STATE"],
     rowConditions: [
-      'AGENT_NAME <> "NOT_MAPPED"',
       'STATE_GROUP <> "NOT_MAPPED"'
     ]
   },
@@ -16,8 +15,8 @@ config {
 
 --Extraction and transformation of fields that are used in Board load further. Contains last 7 days
 select  ags.AGENT_ID,
-        COALESCE(a.AGENT_NAME, 'NOT_MAPPED') as AGENT_NAME,
-        COALESCE(a.AGENT_GROUP, 'NOT_MAPPED') as AGENT_GROUP,
+        ags.AGENT_NAME,
+        ags.AGENT_GROUP,
         COALESCE(a.AGENT_GROUP_ID, 0) as AGENT_GROUP_ID,
         COALESCE(a.LANGUAGES, 'NOT_MAPPED') as LANGUAGES,
         COALESCE(a.CODE, 'NOT_MAPPED') as LANG_CODE,