Merge remote-tracking branch 'upstream/master'

diff --cc packaging/nominatim-db/pyproject.toml
index 454f07ce8025b84978585d7f36f0cec8fb285b15,3c99fd2a1c9ca67cc0a6e0862143842c56cd64f3..0d783ea37e09ed930721ef94fc5b0aed3f78c9bc
--- 1/packaging/nominatim-db/pyproject.toml
--- 2/packaging/nominatim-db/pyproject.toml
+++ b/packaging/nominatim-db/pyproject.toml
@@@ -16,15 -15,14 +16,14 @@@ classifiers = 
      "Operating System :: OS Independent",
  ]
  dependencies = [
 -    "psycopg",
 -    "python-dotenv",
 -    "jinja2",
 -    "pyYAML>=5.1",
 -    "psutil",
 -    "PyICU"
 +    "psycopg[binary]==3.2.4",
 +    "python-dotenv==1.0.1",
 +    "jinja2==3.1.5",
 +    "pyYAML==6.0.2",
-     "datrie==0.8.2",
 +    "psutil==7.0.0",
 +    "PyICU==2.14",
 +    "osmium==4.0.2",
  ]
 -dynamic = ["version"]
  
  [project.urls]
  Homepage = "https://nominatim.org"

diff --cc src/nominatim_api/search/db_search_builder.py
index 411e88783bf1f36e6627a26796f40e52f05df7d5,2c5d0d18bad121791f100eb845c1cadcfb9c0e3e..4987f156e9b9a6e134e56a48dafade15729165ab
--- 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
@@@ -214,9 -214,9 +214,9 @@@ class SearchBuilder
              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)
+         name_fulls = self.query.get_tokens(name, qmod.TOKEN_WORD)
          if name_fulls:
              fulls_count = sum(t.count for t in name_fulls)
  

diff --cc src/nominatim_api/search/icu_tokenizer.py
Simple merge