diff --git a/interface/import/map_trigger.sql b/interface/import/map_trigger.sql
index 86f8304..6002dc1 100644
--- a/interface/import/map_trigger.sql
+++ b/interface/import/map_trigger.sql
@@ -12,83 +12,83 @@ $f$
             --------------------apply regex operations to transactions-----------------------------------------------------------------------------------
 
             rx AS (
-            SELECT 
-                t.srce,
-                t.id,
-                t.rec,
-                m.target,
-                m.seq,
-                regex->>'function' regex_function,
-                e.v ->> 'field' result_key_name,
-                e.v ->> 'key' target_json_path,
-                e.v ->> 'flag' regex_options_flag,
-                e.v->>'map' map_intention,
-                e.v->>'retain' retain_result,
-                e.v->>'regex' regex_expression,
-                e.rn target_item_number,
-                COALESCE(mt.rn,rp.rn,1) result_number,
-                mt.mt rx_match,
-                rp.rp rx_replace,
-                CASE e.v->>'map'
-                    WHEN 'y' THEN
-                        e.v->>'field'
-                    ELSE
-                        null
-                END map_key,
-                CASE e.v->>'map'
-                    WHEN 'y' THEN
-                        CASE regex->>'function'
-                            WHEN 'extract' THEN
-                                CASE WHEN array_upper(mt.mt,1)=1 
-                                    THEN to_json(mt.mt[1])
-                                    ELSE array_to_json(mt.mt)
-                                END::jsonb
-                            WHEN 'replace' THEN
-                                to_jsonb(rp.rp)
-                            ELSE
-                                '{}'::jsonb
-                        END
-                    ELSE
-                        NULL
-                END map_val,
-                CASE e.v->>'retain'
-                    WHEN 'y' THEN
-                        e.v->>'field'
-                    ELSE
-                        NULL
-                END retain_key,
-                CASE e.v->>'retain'
-                    WHEN 'y' THEN
-                        CASE regex->>'function'
-                            WHEN 'extract' THEN
-                                CASE WHEN array_upper(mt.mt,1)=1 
-                                    THEN to_json(trim(mt.mt[1]))
-                                    ELSE array_to_json(mt.mt)
-                                END::jsonb
-                            WHEN 'replace' THEN
-                                to_jsonb(rtrim(rp.rp))
-                            ELSE
-                                '{}'::jsonb
-                        END
-                    ELSE
-                        NULL
-                END retain_val
-            FROM 
-                tps.map_rm m
-                LEFT JOIN LATERAL jsonb_array_elements(m.regex->'where') w(v) ON TRUE
-                INNER JOIN new_table t ON 
-                    t.srce = m.srce AND
-                    t.rec @> w.v
-                LEFT JOIN LATERAL jsonb_array_elements(m.regex->'defn') WITH ORDINALITY e(v, rn) ON true
-                LEFT JOIN LATERAL regexp_matches(t.rec #>> ((e.v ->> 'key')::text[]), e.v ->> 'regex'::text,COALESCE(e.v ->> 'flag','')) WITH ORDINALITY mt(mt, rn) ON
-                    m.regex->>'function' = 'extract'
-                LEFT JOIN LATERAL regexp_replace(t.rec #>> ((e.v ->> 'key')::text[]), e.v ->> 'regex'::text, e.v ->> 'replace'::text,e.v ->> 'flag') WITH ORDINALITY rp(rp, rn) ON
-                    m.regex->>'function' = 'replace'
-            ORDER BY 
-                t.id DESC,
-                m.target,
-                e.rn,
-                COALESCE(mt.rn,rp.rn,1)
+                SELECT 
+                    t.srce,
+                    t.id,
+                    t.rec,
+                    m.target,
+                    m.seq,
+                    regex->'regex'->>'function' regex_function,
+                    e.v ->> 'field' result_key_name,
+                    e.v ->> 'key' target_json_path,
+                    e.v ->> 'flag' regex_options_flag,
+                    e.v->>'map' map_intention,
+                    e.v->>'retain' retain_result,
+                    e.v->>'regex' regex_expression,
+                    e.rn target_item_number,
+                    COALESCE(mt.rn,rp.rn,1) result_number,
+                    mt.mt rx_match,
+                    rp.rp rx_replace,
+                    CASE e.v->>'map'
+                        WHEN 'y' THEN
+                            e.v->>'field'
+                        ELSE
+                            null
+                    END map_key,
+                    CASE e.v->>'map'
+                        WHEN 'y' THEN
+                            CASE regex->'regex'->>'function'
+                                WHEN 'extract' THEN
+                                    CASE WHEN array_upper(mt.mt,1)=1 
+                                        THEN to_json(mt.mt[1])
+                                        ELSE array_to_json(mt.mt)
+                                    END::jsonb
+                                WHEN 'replace' THEN
+                                    to_jsonb(rp.rp)
+                                ELSE
+                                    '{}'::jsonb
+                            END
+                        ELSE
+                            NULL
+                    END map_val,
+                    CASE e.v->>'retain'
+                        WHEN 'y' THEN
+                            e.v->>'field'
+                        ELSE
+                            NULL
+                    END retain_key,
+                    CASE e.v->>'retain'
+                        WHEN 'y' THEN
+                            CASE regex->'regex'->>'function'
+                                WHEN 'extract' THEN
+                                    CASE WHEN array_upper(mt.mt,1)=1 
+                                        THEN to_json(trim(mt.mt[1]))
+                                        ELSE array_to_json(mt.mt)
+                                    END::jsonb
+                                WHEN 'replace' THEN
+                                    to_jsonb(rtrim(rp.rp))
+                                ELSE
+                                    '{}'::jsonb
+                            END
+                        ELSE
+                            NULL
+                    END retain_val
+                FROM 
+                    tps.map_rm m
+                    LEFT JOIN LATERAL jsonb_array_elements(m.regex->'regex'->'where') w(v) ON TRUE
+                    INNER JOIN new_table t ON 
+                        t.srce = m.srce AND
+                        t.rec @> w.v
+                    LEFT JOIN LATERAL jsonb_array_elements(m.regex->'regex'->'defn') WITH ORDINALITY e(v, rn) ON true
+                    LEFT JOIN LATERAL regexp_matches(t.rec #>> ((e.v ->> 'key')::text[]), e.v ->> 'regex'::text,COALESCE(e.v ->> 'flag','')) WITH ORDINALITY mt(mt, rn) ON
+                        m.regex->'regex'->>'function' = 'extract'
+                    LEFT JOIN LATERAL regexp_replace(t.rec #>> ((e.v ->> 'key')::text[]), e.v ->> 'regex'::text, e.v ->> 'replace'::text,e.v ->> 'flag') WITH ORDINALITY rp(rp, rn) ON
+                        m.regex->'regex'->>'function' = 'replace'
+                ORDER BY 
+                    t.id DESC,
+                    m.target,
+                    e.rn,
+                    COALESCE(mt.rn,rp.rn,1)
             )
 
             --SELECT count(*) FROM rx LIMIT 100
diff --git a/interface/map_def/srce_map_def_set_single.sql b/interface/map_def/srce_map_def_set_single.sql
index fa9afb7..e16709e 100644
--- a/interface/map_def/srce_map_def_set_single.sql
+++ b/interface/map_def/srce_map_def_set_single.sql
@@ -4,7 +4,6 @@ $f$
 
 DECLARE
     _message jsonb;
-    _rebuild boolean;
     _MESSAGE_TEXT text;
     _PG_EXCEPTION_DETAIL text;
     _PG_EXCEPTION_HINT text;
@@ -13,7 +12,7 @@ BEGIN
 
     ---------test if anythign is changing--------------------------------------------------------------------------------------------
 
-    IF _defn = (SELECT regex FROM tps.map_rm WHERE srce = _defn->>'name') THEN
+    IF _defn->'regex' = (SELECT regex->'regex' FROM tps.map_rm WHERE srce = _defn->>'srce' and target = _defn->>'name') THEN
          _message:= 
         (
             $$
@@ -65,11 +64,13 @@ BEGIN
     --------------if rebuild was flag call the rebuild--------------------------------------------------------------------------------
 
     SELECT
-        x.message
+        x.message||'{"step":"overwrite maps in tps.trans"}'::jsonb
     INTO
         _message
     FROM
-        tps.srce_map_overwrite as X(message);
+        tps.srce_map_overwrite(_defn->>'srce') as X(message);
+
+    return _message;
 
     EXCEPTION WHEN OTHERS THEN
     GET STACKED DIAGNOSTICS 
diff --git a/interface/map_values/srce_map_overwrite.sql b/interface/map_values/srce_map_overwrite.sql
index f11841f..408f8a9 100644
--- a/interface/map_values/srce_map_overwrite.sql
+++ b/interface/map_values/srce_map_overwrite.sql
@@ -18,7 +18,7 @@ BEGIN
         t.rec,
         m.target,
         m.seq,
-        regex->>'function' regex_function,
+        regex->'regex'->>'function' regex_function,
         e.v ->> 'field' result_key_name,
         e.v ->> 'key' target_json_path,
         e.v ->> 'flag' regex_options_flag,
@@ -37,7 +37,7 @@ BEGIN
         END map_key,
         CASE e.v->>'map'
             WHEN 'y' THEN
-                CASE regex->>'function'
+                CASE regex->'regex'->>'function'
                     WHEN 'extract' THEN
                         CASE WHEN array_upper(mt.mt,1)=1 
                             THEN to_json(mt.mt[1])
@@ -59,7 +59,7 @@ BEGIN
         END retain_key,
         CASE e.v->>'retain'
             WHEN 'y' THEN
-                CASE regex->>'function'
+                CASE regex->'regex'->>'function'
                     WHEN 'extract' THEN
                         CASE WHEN array_upper(mt.mt,1)=1 
                             THEN to_json(trim(mt.mt[1]))
@@ -75,15 +75,15 @@ BEGIN
         END retain_val
     FROM 
         tps.map_rm m
-        LEFT JOIN LATERAL jsonb_array_elements(m.regex->'where') w(v) ON TRUE
+        LEFT JOIN LATERAL jsonb_array_elements(m.regex->'regex'->'where') w(v) ON TRUE
         INNER JOIN tps.trans t ON 
             t.srce = m.srce AND
             t.rec @> w.v
-        LEFT JOIN LATERAL jsonb_array_elements(m.regex->'defn') WITH ORDINALITY e(v, rn) ON true
+        LEFT JOIN LATERAL jsonb_array_elements(m.regex->'regex'->'defn') WITH ORDINALITY e(v, rn) ON true
         LEFT JOIN LATERAL regexp_matches(t.rec #>> ((e.v ->> 'key')::text[]), e.v ->> 'regex'::text,COALESCE(e.v ->> 'flag','')) WITH ORDINALITY mt(mt, rn) ON
-            m.regex->>'function' = 'extract'
+            m.regex->'regex'->>'function' = 'extract'
         LEFT JOIN LATERAL regexp_replace(t.rec #>> ((e.v ->> 'key')::text[]), e.v ->> 'regex'::text, e.v ->> 'replace'::text,e.v ->> 'flag') WITH ORDINALITY rp(rp, rn) ON
-            m.regex->>'function' = 'replace'
+            m.regex->'regex'->>'function' = 'replace'
     WHERE
         --t.allj IS NULL
         t.srce = _srce