Merge remote-tracking branch 'upstream/master'

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

diff --cc src/nominatim_db/tokenizer/icu_tokenizer.py
index 858cb64c63ef4843a49d42da20fa0c2f65fc05ed,297c9ef9a401e02413d8c223f9633c0d4ad36e33..19b838639ab0e557a7cba97fbe5e012a9bf81b70
--- 1/src/nominatim_db/tokenizer/icu_tokenizer.py
--- 2/src/nominatim_db/tokenizer/icu_tokenizer.py
+++ b/src/nominatim_db/tokenizer/icu_tokenizer.py
@@@ -134,12 -134,12 +134,13 @@@ class ICUTokenizer(AbstractTokenizer)
                  drop_tables(conn, 'tmp_word')
                  cur.execute("""CREATE TABLE tmp_word AS
                                  SELECT word_id, word_token, type, word,
-                                        (CASE WHEN wf.info is null THEN word.info
-                                         ELSE coalesce(word.info, '{}'::jsonb) || wf.info
-                                         END) as info
+                                        coalesce(word.info, '{}'::jsonb)
+                                        - 'count' - 'addr_count' ||
+                                        coalesce(wf.info, '{}'::jsonb)
+                                        as info
                                  FROM word LEFT JOIN word_frequencies wf
                                       ON word.word_id = wf.id
 +                                ORDER BY word_id
                              """)
                  drop_tables(conn, 'word_frequencies')