diff --git a/cadastre/scripts/plugin/edigeo_create_table_parcelle_info_majic.sql b/cadastre/scripts/plugin/edigeo_create_table_parcelle_info_majic.sql
index 5da27472..423c0faa 100644
--- a/cadastre/scripts/plugin/edigeo_create_table_parcelle_info_majic.sql
+++ b/cadastre/scripts/plugin/edigeo_create_table_parcelle_info_majic.sql
@@ -41,8 +41,12 @@ string_agg(
     trim(
         pr.dnuper || ' - ' ||
         ltrim(trim(coalesce(pr.dlign4, '')), '0') ||
-        trim(coalesce(pr.dlign5, '')) || ' ' ||
-        trim(coalesce(pr.dlign6, '')) ||
+        CASE
+            WHEN trim(coalesce(pr.dlign5, '')) = ''
+            THEN ''
+            ELSE ' ' || trim(coalesce(pr.dlign5, ''))
+        END
+        || ' ' || trim(coalesce(pr.dlign6, '')) ||
         trim(
             CASE
                 WHEN pr.jdatnss IS NOT NULL
diff --git a/cadastre/templates/parcelle_info_indivisions.sql b/cadastre/templates/parcelle_info_indivisions.sql
index 1f9644cb..b2ac0e5e 100644
--- a/cadastre/templates/parcelle_info_indivisions.sql
+++ b/cadastre/templates/parcelle_info_indivisions.sql
@@ -19,7 +19,7 @@ FROM (
         '<td>' || l.dnulot || '</td>' ||
         '<td>' || l.comptecommunal || '</td>' ||
         '<td>' || trim(coalesce(p.dqualp, '')) || ' ' || trim(coalesce(p.ddenom, '')) || '</td>' ||
-        '<td>' || trim(trim(coalesce(p.dlign3, '')) || ' ' || ltrim(trim(coalesce(p.dlign4, '')), '0') || trim(coalesce(p.dlign5, '')) || ' ' || trim(coalesce(p.dlign6, ''))) || '</td>' ||
+        '<td>' || replace(trim(trim(coalesce(p.dlign3, '')) || ' ' || ltrim(trim(coalesce(p.dlign4, '')), '0') || ' ' || trim(coalesce(p.dlign5, '')) || ' ' || trim(coalesce(p.dlign6, ''))), '  ', ' ') || '</td>' ||
         CASE WHEN {not_for_third_part} THEN '<td>' || Coalesce( trim(cast(p.jdatnss AS text) ), '-') || '</td>' ELSE '' END ||
         '<td>' || coalesce(p.ccodem, '') || '</td>' ||
         '<td>' || coalesce(p.ccodro, '') || '</td>' ||
diff --git a/cadastre/templates/parcelle_info_locaux_detail.sql b/cadastre/templates/parcelle_info_locaux_detail.sql
index 3261febd..049db779 100644
--- a/cadastre/templates/parcelle_info_locaux_detail.sql
+++ b/cadastre/templates/parcelle_info_locaux_detail.sql
@@ -23,7 +23,7 @@ WITH infos AS (
             CASE WHEN trim(pr.dnomus) != trim(pr.dnomlp) THEN Coalesce( trim(pr.dnomus) || '/' || trim(pr.dprnus) || ', née ', '' ) ELSE '' END ||
             trim(coalesce(pr.ddenom, '')) ||
             '</td>' ||
-            '<td>' || ltrim(trim(coalesce(pr.dlign4, '')), '0') || trim(coalesce(pr.dlign5, '')) || ' ' || trim(coalesce(pr.dlign6, '')) || '</td>' ||
+            '<td>' || replace(ltrim(trim(coalesce(pr.dlign4, '')), '0') || ' ' || trim(coalesce(pr.dlign5, '')) || ' ' || trim(coalesce(pr.dlign6, '')), '  ',' ') || '</td>' ||
             CASE WHEN {not_for_third_part} THEN '<td>' || Coalesce( trim(cast(pr.jdatnss AS text) ), '-') || '</td>' ELSE '' END ||
             CASE WHEN {not_for_third_part} THEN '<td>' || coalesce(trim(pr.dldnss), '-') || '</td>' ELSE '' END ||
             '<td>' || Coalesce(ccodro_lib, '') || '</td>' ||
diff --git a/cadastre/templates/parcelle_info_proprietaires.sql b/cadastre/templates/parcelle_info_proprietaires.sql
index 9a73c254..dff264b8 100644
--- a/cadastre/templates/parcelle_info_proprietaires.sql
+++ b/cadastre/templates/parcelle_info_proprietaires.sql
@@ -25,7 +25,7 @@ FROM (
             CASE WHEN trim(p.dnomus) != trim(p.dnomlp) THEN Coalesce( trim(p.dnomus) || '/' || trim(p.dprnus) || ', née ', '' ) ELSE '' END ||
             trim(coalesce(p.ddenom, '')) ||
         '</td>' ||
-        '<td>' || trim(trim(coalesce(p.dlign3, '')) || ' ' || ltrim(trim(coalesce(p.dlign4, '')), '0') || trim(coalesce(p.dlign5, '')) || ' ' || trim(coalesce(p.dlign6, ''))) || '</td>' ||
+        '<td>' || replace(trim(trim(coalesce(p.dlign3, '')) || ' ' || ltrim(trim(coalesce(p.dlign4, '')), '0') || ' ' || trim(coalesce(p.dlign5, '')) || ' ' || trim(coalesce(p.dlign6, ''))), '  ',' ') || '</td>' ||
         CASE WHEN {not_for_third_part} THEN '<td>' || Coalesce( trim(cast(p.jdatnss AS text) ), '-') || '</td>' ELSE '' END ||
         CASE WHEN {not_for_third_part} THEN '<td>' || coalesce(trim(p.dldnss), '-') || '</td>' ELSE '' END ||
         '<td>' || Coalesce(ccodro_lib, '') || '</td>' ||
diff --git a/cadastre/templates/proprietaires_line.tpl.sql b/cadastre/templates/proprietaires_line.tpl.sql
index 4358024c..8016523c 100644
--- a/cadastre/templates/proprietaires_line.tpl.sql
+++ b/cadastre/templates/proprietaires_line.tpl.sql
@@ -1,7 +1,7 @@
 
 SELECT Coalesce(ccodro_lib, '') || ' - ' || p.dnuper || ' - ' || trim(Coalesce(p.dqualp, '')) || ' ' || trim(Coalesce(p.ddenom, '')) AS mainprop,
 CASE WHEN epxnee = 'NEE' THEN 'EP ' || trim(Coalesce(dnomlp, '')) || ' ' || trim(Coalesce(dprnlp, '')) ELSE '' END AS epousede,
-trim(Coalesce(p.dlign3, '')) || ' / ' || ltrim(trim(Coalesce(p.dlign4, '')), '0') || trim(Coalesce(p.dlign5, '')) || ' ' || trim(Coalesce(p.dlign6, '')) AS adrprop,
+trim(Coalesce(p.dlign3, '')) || ' / ' || replace(ltrim(trim(Coalesce(p.dlign4, '')), '0') || ' ' || trim(Coalesce(p.dlign5, '')) || ' ' || trim(Coalesce(p.dlign6, '')), '  ', ' ') AS adrprop,
 CASE
   WHEN jdatnss IS NOT NULL AND NOT $for_third_party
   THEN ' Né(e) le ' || jdatnss || ' à ' || coalesce(p.dldnss, '')