Merge remote-tracking branch 'upstream/master'

diff --combined lib/Geocode.php
index cce85f2b31b8f78c982fe9f9674355d3a40a95e7,ed02848eac4c2c846ea1a655089caa75aca879cd..6589f75485dceb98f37ad248e1ff97e8338e9f99
--- 1/lib/Geocode.php
--- 2/lib/Geocode.php
+++ b/lib/Geocode.php
@@@ -18,7 -18,7 +18,7 @@@ class Geocod
      protected $aLangPrefOrder = array();
  
      protected $aExcludePlaceIDs = array();
 -    protected $bReverseInPlan = false;
 +    protected $bReverseInPlan = true;
  
      protected $iLimit = 20;
      protected $iFinalLimit = 10;
@@@ -650,6 -650,8 +650,8 @@@
                      $this->oNormalizer
                  );
  
+                 $oCtx->setFullNameWords($oValidTokens->getFullWordIDs());
+ 
                  // Try more interpretations for Tokens that could not be matched.
                  foreach ($aTokens as $sToken) {
                      if ($sToken[0] == ' ' && !$oValidTokens->contains($sToken)) {

diff --combined sql/functions/address_lookup.sql
index de6fe1d17de5edf150d09f0a3fe7f892d48da3dc,6ee1f048600b005071d2a546f4aaa470d23be396..2426a698f03c4dc3cb373ff793fa9e1eb364e6e7
--- 1/sql/functions/address_lookup.sql
--- 2/sql/functions/address_lookup.sql
+++ b/sql/functions/address_lookup.sql
@@@ -214,7 -214,7 +214,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)
@@@ -289,7 -289,7 +289,7 @@@
  
    IF search_unlisted_place is not null THEN
      RETURN NEXT ROW(null, null, null, hstore('name', search_unlisted_place),
-                     'place', 'locality', null, null, true, true, 26, 0)::addressline;
+                     'place', 'locality', null, null, true, true, 25, 0)::addressline;
    END IF;
  
    IF searchpostcode IS NOT NULL THEN