X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6cc6cf950c3c08103e6159a079c85b5a4f1c09fa..228ef1972a915d1f960e021f4496147645e22370:/sql/functions/address_lookup.sql

diff --git a/sql/functions/address_lookup.sql b/sql/functions/address_lookup.sql
index f8659c70..daed3a8b 100644
--- a/sql/functions/address_lookup.sql
+++ b/sql/functions/address_lookup.sql
@@ -69,7 +69,7 @@ BEGIN
     IF currresult != prevresult AND currresult IS NOT NULL
        AND result[(100 - location.rank_address)] IS NULL
     THEN
-      result[(100 - location.rank_address)] := trim(get_name_by_language(location.name, languagepref));
+      result[(100 - location.rank_address)] := currresult;
       prevresult := currresult;
     END IF;
   END LOOP;
@@ -208,7 +208,7 @@ BEGIN
   FOR location IN
     SELECT placex.place_id, osm_type, osm_id, name, class, type,
            coalesce(extratags->'place', extratags->'linked_place') as place_type,
-           admin_level, fromarea, isaddress,
+           admin_level, fromarea, isaddress and linked_place_id is NULL as isaddress,
            CASE WHEN rank_address = 11 THEN 5 ELSE rank_address END as rank_address,
            distance, country_code, postcode
       FROM place_addressline join placex on (address_place_id = placex.place_id)