Merge remote-tracking branch 'upstream/master'

diff --combined lib-sql/functions/address_lookup.sql
index 312aa9b2d872dac607cf1276f314bfc1ad58e108,5d2cb94d1c44214b1a7883e2e45a04ff01491f4f..a32bfe710419e97bb65ba951b17b29502450fd87
--- 1/lib-sql/functions/address_lookup.sql
--- 2/lib-sql/functions/address_lookup.sql
+++ b/lib-sql/functions/address_lookup.sql
@@@ -187,6 -187,7 +187,7 @@@ BEGI
  
    -- --- Return the record for the base entry.
  
+   current_rank_address := 1000;
    FOR location IN
      SELECT placex.place_id, osm_type, osm_id, name,
             coalesce(extratags->'linked_place', extratags->'place') as place_type,
@@@ -231,7 -232,7 +232,7 @@@
    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)