diff --git a/resources/templates/qgisproject/en_US/ud_admin.qgs b/resources/templates/qgisproject/en_US/ud_admin.qgs
index 16066c569..198a74929 100644
--- a/resources/templates/qgisproject/en_US/ud_admin.qgs
+++ b/resources/templates/qgisproject/en_US/ud_admin.qgs
@@ -275,13 +275,13 @@
         </layer-tree-group>
         <layer-tree-group checked="Qt::Unchecked" name="Dscenario" expanded="0">
           <customproperties/>
-          <layer-tree-layer checked="Qt::Checked" name="Conduit dscenario" id="v_edit_inp_dscenario_conduit_23a98fde_f557_42a1_ac50_fde73244ab03" expanded="1" source=" dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_dscenario_conduit&quot;" providerKey="postgres" patch_size="-1,-1" legend_split_behavior="0" legend_exp="">
+          <layer-tree-layer checked="Qt::Checked" name="Conduit dscenario" id="v_edit_inp_dscenario_conduit_23a98fde_f557_42a1_ac50_fde73244ab03" expanded="1" source=" dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id,arc_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_dscenario_conduit&quot;" providerKey="postgres" patch_size="-1,-1" legend_split_behavior="0" legend_exp="">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Junction dscenario" id="v_edit_inp_dscenario_junction_623c4468_e6e5_4432_8202_ceb2adcb608e" expanded="1" source=" dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_dscenario_junction&quot;" providerKey="postgres" patch_size="-1,-1" legend_split_behavior="0" legend_exp="">
+          <layer-tree-layer checked="Qt::Checked" name="Junction dscenario" id="v_edit_inp_dscenario_junction_623c4468_e6e5_4432_8202_ceb2adcb608e" expanded="1" source=" dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id,node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_dscenario_junction&quot;" providerKey="postgres" patch_size="-1,-1" legend_split_behavior="0" legend_exp="">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Raingage dscenario" id="v_edit_inp_dscenario_raingage_0c73062a_fc77_4f45_aef5_e031ebd4b9ac" expanded="1" source=" dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_dscenario_raingage&quot;" providerKey="postgres" patch_size="-1,-1" legend_split_behavior="0" legend_exp="">
+          <layer-tree-layer checked="Qt::Checked" name="Raingage dscenario" id="v_edit_inp_dscenario_raingage_0c73062a_fc77_4f45_aef5_e031ebd4b9ac" expanded="1" source=" dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id,rg_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_dscenario_raingage&quot;" providerKey="postgres" patch_size="-1,-1" legend_split_behavior="0" legend_exp="">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
@@ -22129,7 +22129,7 @@ def my_form_open(dialog, layer, feature):
     </maplayer>
     <maplayer autoRefreshTime="0" type="vector" hasScaleBasedVisibilityFlag="0" maxScale="0" minScale="1e+08" refreshOnNotifyMessage="" wkbType="NoGeometry" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" geometry="No geometry" styleCategories="AllStyleCategories" readOnly="0">
       <id>v_edit_inp_dscenario_conduit_23a98fde_f557_42a1_ac50_fde73244ab03</id>
-      <datasource> dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_dscenario_conduit"</datasource>
+      <datasource> dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id,arc_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_dscenario_conduit"</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -22393,7 +22393,7 @@ def my_form_open(dialog, layer, feature):
     </maplayer>
     <maplayer autoRefreshTime="0" type="vector" hasScaleBasedVisibilityFlag="0" maxScale="0" minScale="1e+08" refreshOnNotifyMessage="" wkbType="NoGeometry" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" geometry="No geometry" styleCategories="AllStyleCategories" readOnly="0">
       <id>v_edit_inp_dscenario_junction_623c4468_e6e5_4432_8202_ceb2adcb608e</id>
-      <datasource> dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_dscenario_junction"</datasource>
+      <datasource> dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id,node_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_dscenario_junction"</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -22569,7 +22569,7 @@ def my_form_open(dialog, layer, feature):
     </maplayer>
     <maplayer autoRefreshTime="0" type="vector" hasScaleBasedVisibilityFlag="0" maxScale="0" minScale="1e+08" refreshOnNotifyMessage="" wkbType="NoGeometry" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" geometry="No geometry" styleCategories="AllStyleCategories" readOnly="0">
       <id>v_edit_inp_dscenario_raingage_0c73062a_fc77_4f45_aef5_e031ebd4b9ac</id>
-      <datasource> dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_dscenario_raingage"</datasource>
+      <datasource> dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id,rg_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_dscenario_raingage"</datasource>
       <keywordList>
         <value></value>
       </keywordList>
diff --git a/resources/templates/qgisproject/en_US/ud_epa.qgs b/resources/templates/qgisproject/en_US/ud_epa.qgs
index 749ef657c..009ee253a 100644
--- a/resources/templates/qgisproject/en_US/ud_epa.qgs
+++ b/resources/templates/qgisproject/en_US/ud_epa.qgs
@@ -275,13 +275,13 @@
         </layer-tree-group>
         <layer-tree-group checked="Qt::Unchecked" name="Dscenario" expanded="0">
           <customproperties/>
-          <layer-tree-layer checked="Qt::Checked" name="Conduit dscenario" id="v_edit_inp_dscenario_conduit_23a98fde_f557_42a1_ac50_fde73244ab03" expanded="1" source=" dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_dscenario_conduit&quot;" providerKey="postgres" patch_size="-1,-1" legend_split_behavior="0" legend_exp="">
+          <layer-tree-layer checked="Qt::Checked" name="Conduit dscenario" id="v_edit_inp_dscenario_conduit_23a98fde_f557_42a1_ac50_fde73244ab03" expanded="1" source=" dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id,arc_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_dscenario_conduit&quot;" providerKey="postgres" patch_size="-1,-1" legend_split_behavior="0" legend_exp="">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Junction dscenario" id="v_edit_inp_dscenario_junction_623c4468_e6e5_4432_8202_ceb2adcb608e" expanded="1" source=" dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_dscenario_junction&quot;" providerKey="postgres" patch_size="-1,-1" legend_split_behavior="0" legend_exp="">
+          <layer-tree-layer checked="Qt::Checked" name="Junction dscenario" id="v_edit_inp_dscenario_junction_623c4468_e6e5_4432_8202_ceb2adcb608e" expanded="1" source=" dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id,node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_dscenario_junction&quot;" providerKey="postgres" patch_size="-1,-1" legend_split_behavior="0" legend_exp="">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Raingage dscenario" id="v_edit_inp_dscenario_raingage_0c73062a_fc77_4f45_aef5_e031ebd4b9ac" expanded="1" source=" dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_dscenario_raingage&quot;" providerKey="postgres" patch_size="-1,-1" legend_split_behavior="0" legend_exp="">
+          <layer-tree-layer checked="Qt::Checked" name="Raingage dscenario" id="v_edit_inp_dscenario_raingage_0c73062a_fc77_4f45_aef5_e031ebd4b9ac" expanded="1" source=" dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id,rg_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_dscenario_raingage&quot;" providerKey="postgres" patch_size="-1,-1" legend_split_behavior="0" legend_exp="">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
@@ -19033,7 +19033,7 @@ def my_form_open(dialog, layer, feature):
     </maplayer>
     <maplayer autoRefreshTime="0" type="vector" hasScaleBasedVisibilityFlag="0" maxScale="0" minScale="1e+08" refreshOnNotifyMessage="" wkbType="NoGeometry" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" geometry="No geometry" styleCategories="AllStyleCategories" readOnly="0">
       <id>v_edit_inp_dscenario_conduit_23a98fde_f557_42a1_ac50_fde73244ab03</id>
-      <datasource> dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_dscenario_conduit"</datasource>
+      <datasource> dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id,arc_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_dscenario_conduit"</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -19297,7 +19297,7 @@ def my_form_open(dialog, layer, feature):
     </maplayer>
     <maplayer autoRefreshTime="0" type="vector" hasScaleBasedVisibilityFlag="0" maxScale="0" minScale="1e+08" refreshOnNotifyMessage="" wkbType="NoGeometry" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" geometry="No geometry" styleCategories="AllStyleCategories" readOnly="0">
       <id>v_edit_inp_dscenario_junction_623c4468_e6e5_4432_8202_ceb2adcb608e</id>
-      <datasource> dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_dscenario_junction"</datasource>
+      <datasource> dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id,node_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_dscenario_junction"</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -19473,7 +19473,7 @@ def my_form_open(dialog, layer, feature):
     </maplayer>
     <maplayer autoRefreshTime="0" type="vector" hasScaleBasedVisibilityFlag="0" maxScale="0" minScale="1e+08" refreshOnNotifyMessage="" wkbType="NoGeometry" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" geometry="No geometry" styleCategories="AllStyleCategories" readOnly="0">
       <id>v_edit_inp_dscenario_raingage_0c73062a_fc77_4f45_aef5_e031ebd4b9ac</id>
-      <datasource> dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_dscenario_raingage"</datasource>
+      <datasource> dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id,rg_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_dscenario_raingage"</datasource>
       <keywordList>
         <value></value>
       </keywordList>
diff --git a/resources/templates/qgisproject/en_US/ud_master.qgs b/resources/templates/qgisproject/en_US/ud_master.qgs
index 38128c276..97498d1e0 100644
--- a/resources/templates/qgisproject/en_US/ud_master.qgs
+++ b/resources/templates/qgisproject/en_US/ud_master.qgs
@@ -275,13 +275,13 @@
         </layer-tree-group>
         <layer-tree-group checked="Qt::Unchecked" name="Dscenario" expanded="0">
           <customproperties/>
-          <layer-tree-layer checked="Qt::Checked" name="Conduit dscenario" id="v_edit_inp_dscenario_conduit_23a98fde_f557_42a1_ac50_fde73244ab03" expanded="1" source=" dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_dscenario_conduit&quot;" providerKey="postgres" patch_size="-1,-1" legend_split_behavior="0" legend_exp="">
+          <layer-tree-layer checked="Qt::Checked" name="Conduit dscenario" id="v_edit_inp_dscenario_conduit_23a98fde_f557_42a1_ac50_fde73244ab03" expanded="1" source=" dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id,arc_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_dscenario_conduit&quot;" providerKey="postgres" patch_size="-1,-1" legend_split_behavior="0" legend_exp="">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Junction dscenario" id="v_edit_inp_dscenario_junction_623c4468_e6e5_4432_8202_ceb2adcb608e" expanded="1" source=" dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_dscenario_junction&quot;" providerKey="postgres" patch_size="-1,-1" legend_split_behavior="0" legend_exp="">
+          <layer-tree-layer checked="Qt::Checked" name="Junction dscenario" id="v_edit_inp_dscenario_junction_623c4468_e6e5_4432_8202_ceb2adcb608e" expanded="1" source=" dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id,node_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_dscenario_junction&quot;" providerKey="postgres" patch_size="-1,-1" legend_split_behavior="0" legend_exp="">
             <customproperties/>
           </layer-tree-layer>
-          <layer-tree-layer checked="Qt::Checked" name="Raingage dscenario" id="v_edit_inp_dscenario_raingage_0c73062a_fc77_4f45_aef5_e031ebd4b9ac" expanded="1" source=" dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_dscenario_raingage&quot;" providerKey="postgres" patch_size="-1,-1" legend_split_behavior="0" legend_exp="">
+          <layer-tree-layer checked="Qt::Checked" name="Raingage dscenario" id="v_edit_inp_dscenario_raingage_0c73062a_fc77_4f45_aef5_e031ebd4b9ac" expanded="1" source=" dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id,rg_id' checkPrimaryKeyUnicity='1' table=&quot;SCHEMA_NAME&quot;.&quot;v_edit_inp_dscenario_raingage&quot;" providerKey="postgres" patch_size="-1,-1" legend_split_behavior="0" legend_exp="">
             <customproperties/>
           </layer-tree-layer>
         </layer-tree-group>
@@ -19669,7 +19669,7 @@ def my_form_open(dialog, layer, feature):
     </maplayer>
     <maplayer autoRefreshTime="0" type="vector" hasScaleBasedVisibilityFlag="0" maxScale="0" minScale="1e+08" refreshOnNotifyMessage="" wkbType="NoGeometry" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" geometry="No geometry" styleCategories="AllStyleCategories" readOnly="0">
       <id>v_edit_inp_dscenario_conduit_23a98fde_f557_42a1_ac50_fde73244ab03</id>
-      <datasource> dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_dscenario_conduit"</datasource>
+      <datasource> dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id,arc_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_dscenario_conduit"</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -19933,7 +19933,7 @@ def my_form_open(dialog, layer, feature):
     </maplayer>
     <maplayer autoRefreshTime="0" type="vector" hasScaleBasedVisibilityFlag="0" maxScale="0" minScale="1e+08" refreshOnNotifyMessage="" wkbType="NoGeometry" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" geometry="No geometry" styleCategories="AllStyleCategories" readOnly="0">
       <id>v_edit_inp_dscenario_junction_623c4468_e6e5_4432_8202_ceb2adcb608e</id>
-      <datasource> dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_dscenario_junction"</datasource>
+      <datasource> dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id,node_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_dscenario_junction"</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -20109,7 +20109,7 @@ def my_form_open(dialog, layer, feature):
     </maplayer>
     <maplayer autoRefreshTime="0" type="vector" hasScaleBasedVisibilityFlag="0" maxScale="0" minScale="1e+08" refreshOnNotifyMessage="" wkbType="NoGeometry" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" geometry="No geometry" styleCategories="AllStyleCategories" readOnly="0">
       <id>v_edit_inp_dscenario_raingage_0c73062a_fc77_4f45_aef5_e031ebd4b9ac</id>
-      <datasource> dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_dscenario_raingage"</datasource>
+      <datasource> dbname='__DBNAME__'  host=__HOST__  port=__PORT__  sslmode=__SSLMODE__ key='dscenario_id,rg_id' checkPrimaryKeyUnicity='1' table="SCHEMA_NAME"."v_edit_inp_dscenario_raingage"</datasource>
       <keywordList>
         <value></value>
       </keywordList>