Merge remote-tracking branch 'upstream/master'

diff --combined lib/Geocode.php
index e2d676862a5f6a3c74cd002d4818e211c0ee9567,7a9f5ad4f2799531c726712dd302612c99dc455f..12410acc81a03373bdbd9e44d1dbee84daf13307
--- 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;
@@@ -348,10 -348,7 +348,7 @@@
              $aNewPhraseSearches = array();
              $sPhraseType = $bIsStructured ? $oPhrase->getPhraseType() : '';
  
-             foreach ($oPhrase->getWordSets() as $iWordSet => $aWordset) {
-                 // Too many permutations - too expensive
-                 if ($iWordSet > 120) break;
- 
+             foreach ($oPhrase->getWordSets() as $aWordset) {
                  $aWordsetSearches = $aSearches;
  
                  // Add all words from this wordset
@@@ -641,7 -638,6 +638,6 @@@
                  }
              }
  
-             Debug::printDebugTable('Phrases', $aPhrases);
              Debug::printVar('Tokens', $aTokens);
  
              $oValidTokens = new TokenList();
@@@ -686,6 -682,11 +682,11 @@@
  
                  Debug::printGroupTable('Valid Tokens', $oValidTokens->debugInfo());
  
+                 foreach ($aPhrases as $oPhrase) {
+                     $oPhrase->computeWordSets($oValidTokens);
+                 }
+                 Debug::printDebugTable('Phrases', $aPhrases);
+ 
                  Debug::newSection('Search candidates');
  
                  $aGroupedSearches = $this->getGroupedSearches($aSearches, $aPhrases, $oValidTokens, $bStructuredPhrases);