Merge remote-tracking branch 'upstream/master'

diff --cc packaging/nominatim-db/pyproject.toml
Simple merge

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

diff --cc src/nominatim_api/search/icu_tokenizer.py
index ac78d03c1fc1776667d3cb31020cc03bfa0c5a90,6f1dcf7902ab65e5a4481d6a3d7b65e6274deab8..8f2069c1a8bc57212956d1ce64d3a5914c12f920
--- 1/src/nominatim_api/search/icu_tokenizer.py
--- 2/src/nominatim_api/search/icu_tokenizer.py
+++ b/src/nominatim_api/search/icu_tokenizer.py
@@@ -164,14 -206,10 +206,16 @@@ class ICUQueryAnalyzer(AbstractQueryAna
              tokenized query.
          """
          log().section('Analyze query (using ICU tokenizer)')
-         normalized = list(filter(lambda p: p.text,
-                                  (qmod.Phrase(p.ptype, self.normalize_text(p.text))
-                                   for p in phrases)))
-         if len(normalized) == 1 \
-                 and normalized[0].text.count(' ') > 3 \
-                 and max(len(s) for s in normalized[0].text.split()) < 3:
+         for func in self.preprocessors:
+             phrases = func(phrases)
++
++        if len(phrases) == 1 \
++                and phrases[0].text.count(' ') > 3 \
++                and max(len(s) for s in phrases[0].text.split()) < 3:
 +            normalized = []
-         query = qmod.QueryStruct(normalized)
++
+         query = qmod.QueryStruct(phrases)
+ 
          log().var_dump('Normalized query', query.source)
          if not query.source:
              return query