Merge remote-tracking branch 'upstream/master'

diff --combined sql/functions/address_lookup.sql
index 7e8a9ecda967e95a22f5d1ff590767a6ca68c2c8,42c015bfd28d3d1fedb77e907740cab9ccf7d867..88b3a741f3d5e85099263d3b954f072c00ede472
--- 1/sql/functions/address_lookup.sql
--- 2/sql/functions/address_lookup.sql
+++ b/sql/functions/address_lookup.sql
@@@ -208,7 -208,7 +208,7 @@@ BEGI
    FOR location IN
      SELECT placex.place_id, osm_type, osm_id, name, class, type,
             coalesce(extratags->'linked_place', extratags->'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)
@@@ -272,7 -272,7 +272,7 @@@
    END IF;
  
    IF searchhousenumber IS NOT NULL THEN
-     location := ROW(in_place_id, null, null, hstore('ref', searchhousenumber),
+     location := ROW(null, null, null, hstore('ref', searchhousenumber),
                      'place', 'house_number', null, null, true, true, 28, 0)::addressline;
      RETURN NEXT location;
    END IF;