Merge remote-tracking branch 'upstream/master'

diff --combined sql/functions/address_lookup.sql
index 5f73ac9f265648df6bcefb1563d4e915e58e911e,9a4c630ca14b224729b9de575fbc921080fae1d1..c8c6309211fc7b7846ef66c6d8fe3c345230ae62
--- 1/sql/functions/address_lookup.sql
--- 2/sql/functions/address_lookup.sql
+++ b/sql/functions/address_lookup.sql
@@@ -206,7 -206,7 +206,7 @@@ BEGI
    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)
@@@ -277,7 -277,7 +277,7 @@@
  
    IF searchpostcode IS NOT NULL THEN
      location := ROW(null, null, null, hstore('ref', searchpostcode), 'place',
-                     'postcodes', null, null, false, true, 5, 0)::addressline;
+                     'postcode', null, null, false, true, 5, 0)::addressline;
      RETURN NEXT location;
    END IF;