Merge remote-tracking branch 'upstream/master'

diff --combined sql/functions.sql
index 039c03a3645602a8c7a212b2ad5da8e824b63f27,f3bff89c66e63a018ce03e482447f8f2a1b246dc..c7d96cdc6e2a8daef3b4bc2199a6118fcead26b3
--- 1/sql/functions.sql
--- 2/sql/functions.sql
+++ b/sql/functions.sql
@@@ -2386,7 -2386,7 +2386,7 @@@ BEGI
  
    -- postcode table
    IF for_place_id IS NULL THEN
-     SELECT parent_place_id, country_code, rank_address, postcode, 'place', 'postcode'
+     SELECT parent_place_id, country_code, rank_search, postcode, 'place', 'postcode'
        FROM location_postcode
        WHERE place_id = in_place_id
        INTO for_place_id, searchcountrycode, searchrankaddress, searchpostcode,
@@@ -2449,7 -2449,7 +2449,7 @@@
      SELECT placex.place_id, osm_type, osm_id, name,
             CASE WHEN extratags ? 'place' THEN 'place' ELSE class END as class,
             CASE WHEN extratags ? 'place' THEN extratags->'place' ELSE type END as 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)