Merge remote-tracking branch 'upstream/master'

diff --combined src/nominatim_api/search/db_search_builder.py
index dbf84a0cafb04ad36435c6d20627cab98d313f20,a67db1e3324dc2974abfc37f91f7fdf53799fc12..411e88783bf1f36e6627a26796f40e52f05df7d5
--- 1/src/nominatim_api/search/db_search_builder.py
--- 2/src/nominatim_api/search/db_search_builder.py
+++ b/src/nominatim_api/search/db_search_builder.py
@@@ -148,7 -148,6 +148,6 @@@ class SearchBuilder
                                                   [t.token for r in address
                                                    for t in self.query.get_partials_list(r)],
                                                   lookups.Restrict)]
-                 penalty += 0.2
              yield dbs.PostcodeSearch(penalty, sdata)
  
      def build_housenumber_search(self, sdata: dbf.SearchData, hnrs: List[Token],
@@@ -215,13 -214,13 +214,13 @@@
              yield penalty, exp_count, dbf.lookup_by_names(list(name_partials.keys()), addr_tokens)
              return
  
 -        addr_count = min(t.addr_count for t in addr_partials) if addr_partials else 30000
 +        addr_count = min(t.addr_count for t in addr_partials) if addr_partials else 50000
          # Partial term to frequent. Try looking up by rare full names first.
          name_fulls = self.query.get_tokens(name, TokenType.WORD)
          if name_fulls:
              fulls_count = sum(t.count for t in name_fulls)
  
 -            if fulls_count < 50000 or addr_count < 30000:
 +            if fulls_count < 80000 or addr_count < 50000:
                  yield penalty, fulls_count / (2**len(addr_tokens)), \
                      self.get_full_name_ranking(name_fulls, addr_partials,
                                                 fulls_count > 30000 / max(1, len(addr_tokens)))
@@@ -269,7 -268,12 +268,7 @@@
          # This might yield wrong results, nothing we can do about that.
          if use_lookup:
              addr_restrict_tokens = []
 -            addr_lookup_tokens = []
 -            for t in addr_partials:
 -                if t.addr_count > 20000:
 -                    addr_restrict_tokens.append(t.token)
 -                else:
 -                    addr_lookup_tokens.append(t.token)
 +            addr_lookup_tokens = [t.token for t in addr_partials]
          else:
              addr_restrict_tokens = [t.token for t in addr_partials]
              addr_lookup_tokens = []