diff --git a/.github/issue_template.md b/.github/issue_template.md
index 645d16790..d523c979a 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -7,3 +7,5 @@ When report an issue on existing analyser, in addition on the name of the issue,
 - the item and class number,
 - or a link to detail of this marker, from the green "details" links in the popup. If you mark the issue as "false positive" on the osmose-frontend we can no more use this link,
 - or at least a permalink to the Osmose map.
+
+Please, report your issue in English.
diff --git a/analysers/analyser_osmosis_addr_interpolation.py b/analysers/analyser_osmosis_addr_interpolation.py
index 39b838a63..d1554b365 100644
--- a/analysers/analyser_osmosis_addr_interpolation.py
+++ b/analysers/analyser_osmosis_addr_interpolation.py
@@ -61,6 +61,10 @@
 CREATE INDEX idx_interpolation_nodes_addr_housenumber ON interpolation_nodes((tags?'addr:housenumber')) WHERE tags?'addr:housenumber'
 """
 
+sql04 = """
+CREATE INDEX idx_interpolation_nodes_geom ON interpolation_nodes USING gist(geom)
+"""
+
 sql10 = """
 SELECT
     id,
@@ -101,6 +105,7 @@
 FROM
     interpolations AS ways
     LEFT JOIN interpolation_nodes AS nodes ON
+        ways.linestring && nodes.geom AND
         ways.id = ANY (nodes.w_ids) AND
         (
             nodes.id = ways.nodes[1] OR
@@ -191,6 +196,7 @@ def analyser_osmosis_common(self):
         self.run(sql01)
         self.run(sql02)
         self.run(sql03)
+        self.run(sql04)
         self.run(sql10, self.callback10)
         self.run(sql20, self.callback20)
         self.run(sql30, self.callback30)