diff --git a/code/infrastructure/streaming/clients/sub/postgres/sub_pg_cdm.py b/code/infrastructure/streaming/clients/sub/postgres/sub_pg_cdm.py
index 37f7fed1b5ce2de385a1b0308c5afeb3e0cc76fe..a7b6615fa2315c31cd3235bd9f413545508859b6 100755
--- a/code/infrastructure/streaming/clients/sub/postgres/sub_pg_cdm.py
+++ b/code/infrastructure/streaming/clients/sub/postgres/sub_pg_cdm.py
@@ -160,11 +160,11 @@ def parse_json_to_sql_query(json,node_type):
         add_edge(key, keys, rel, dest, edge_type,json)  
 
         rel = 'affects'
-        key = f"{key_header}_sourceUUID"
+        key = f"{key_header}_sourceUUID{key_postfix}"
         add_edge(key, keys, rel, dest, edge_type,json)  
 
         rel = 'affects2'
-        key = f"{key_header}_sinkUUID"
+        key = f"{key_header}_sinkUUID{key_postfix}"
         add_edge(key, keys, rel, dest, edge_type,json)  
 
     edge_values = [source,dest,edge_type]
@@ -261,7 +261,7 @@ client.on_connect = on_connect
 client.on_message = on_message
 client.failed_connect = False
 
-client.connect(broker_hostname,broker_port,60)
+client.connect(broker_hostname,broker_port,keepalive=3600*4)
 client.loop_start()
 
 # this try-finally block ensures that whenever we terminate the program earlier by hitting ctrl+c, it still gracefully exits