diff --git a/api/bro_upload/templates/registration_GMW_Construction.html b/api/bro_upload/templates/registration_GMW_Construction.html
index 1043eed..b73bbc9 100644
--- a/api/bro_upload/templates/registration_GMW_Construction.html
+++ b/api/bro_upload/templates/registration_GMW_Construction.html
@@ -35,9 +35,7 @@
                 <ns2:localVerticalReferencePoint codeSpace="urn:bro:gmw:LocalVerticalReferencePoint">{{ sourcedocs_data.localVerticalReferencePoint }}</ns2:localVerticalReferencePoint>
                 <ns2:offset uom="m">{{ sourcedocs_data.offset }}</ns2:offset>
                 <ns2:verticalDatum codeSpace="urn:bro:gmw:VerticalDatum">{{ sourcedocs_data.verticalDatum }}</ns2:verticalDatum>
-{%              if sourcedocs_data.groundLevelPosition %}
                 <ns2:groundLevelPosition uom="m">{{ sourcedocs_data.groundLevelPosition }}</ns2:groundLevelPosition>
-{%              endif %}
                 <ns2:groundLevelPositioningMethod codeSpace="urn:bro:gmw:GroundLevelPositioningMethod">{{ sourcedocs_data.groundLevelPositioningMethod }}</ns2:groundLevelPositioningMethod>
             </ns:deliveredVerticalPosition>
 {%          for monitoringtube in sourcedocs_data.monitoringTubes %}
@@ -47,9 +45,7 @@
                 <ns:artesianWellCapPresent>{{ monitoringtube.artesianWellCapPresent }}</ns:artesianWellCapPresent>
                 <ns:sedimentSumpPresent>{{ monitoringtube.sedimentSumpPresent }}</ns:sedimentSumpPresent>
                 <ns:numberOfGeoOhmCables>{{ monitoringtube.numberOfGeoOhmCables }}</ns:numberOfGeoOhmCables>
-{%              if monitoringtube.tubeTopDiameter %}
                 <ns:tubeTopDiameter uom="mm">{{ monitoringtube.tubeTopDiameter }}</ns:tubeTopDiameter>
-{%              endif %}
                 <ns:variableDiameter>{{ monitoringtube.variableDiameter }}</ns:variableDiameter>
                 <ns:tubeStatus codeSpace="urn:bro:gmw:TubeStatus">{{ monitoringtube.tubeStatus }}</ns:tubeStatus>
                 <ns:tubeTopPosition uom="m">{{ monitoringtube.tubeTopPosition }}</ns:tubeTopPosition>
diff --git a/api/bro_upload/templates/replace_GMW_Construction.html b/api/bro_upload/templates/replace_GMW_Construction.html
index 1750e3e..a15b7f2 100644
--- a/api/bro_upload/templates/replace_GMW_Construction.html
+++ b/api/bro_upload/templates/replace_GMW_Construction.html
@@ -37,9 +37,7 @@
                 <ns2:localVerticalReferencePoint codeSpace="urn:bro:gmw:LocalVerticalReferencePoint">{{ sourcedocs_data.localVerticalReferencePoint }}</ns2:localVerticalReferencePoint>
                 <ns2:offset uom="m">{{ sourcedocs_data.offset }}</ns2:offset>
                 <ns2:verticalDatum codeSpace="urn:bro:gmw:VerticalDatum">{{ sourcedocs_data.verticalDatum }}</ns2:verticalDatum>
-{%              if sourcedocs_data.groundLevelPosition %}
                 <ns2:groundLevelPosition uom="m">{{ sourcedocs_data.groundLevelPosition }}</ns2:groundLevelPosition>
-{%              endif %}
                 <ns2:groundLevelPositioningMethod codeSpace="urn:bro:gmw:GroundLevelPositioningMethod">{{ sourcedocs_data.groundLevelPositioningMethod }}</ns2:groundLevelPositioningMethod>
             </ns:deliveredVerticalPosition>
 {%          for monitoringtube in sourcedocs_data.monitoringTubes %}
@@ -49,9 +47,7 @@
                 <ns:artesianWellCapPresent>{{ monitoringtube.artesianWellCapPresent }}</ns:artesianWellCapPresent>
                 <ns:sedimentSumpPresent>{{ monitoringtube.sedimentSumpPresent }}</ns:sedimentSumpPresent>
                 <ns:numberOfGeoOhmCables>{{ monitoringtube.numberOfGeoOhmCables }}</ns:numberOfGeoOhmCables>
-{%              if monitoringtube.tubeTopDiameter %}
                 <ns:tubeTopDiameter uom="mm">{{ monitoringtube.tubeTopDiameter }}</ns:tubeTopDiameter>
-{%              endif %}
                 <ns:variableDiameter>{{ monitoringtube.variableDiameter }}</ns:variableDiameter>
                 <ns:tubeStatus codeSpace="urn:bro:gmw:TubeStatus">{{ monitoringtube.tubeStatus }}</ns:tubeStatus>
                 <ns:tubeTopPosition uom="m">{{ monitoringtube.tubeTopPosition }}</ns:tubeTopPosition>