diff --git a/conf/lubis.conf.part b/conf/lubis.conf.part
index 842c8b2..f1ac0dd 100644
--- a/conf/lubis.conf.part
+++ b/conf/lubis.conf.part
@@ -43,9 +43,9 @@ source src_ch_swisstopo_lubis_luftbilder_farbe : def_searchable_features_with_ye
     sql_db = lubis_${DBSTAGING}
     sql_query = \
         SELECT row_number() OVER(ORDER BY ebkey asc) as id \
-            , concat(flugdatum, ' ', bildnummer, ' (', concat_ws(', ', ort, ebkey), ')' ) as label \
+            , concat(flugdatum, ' ', feature_id, ' (', concat_ws(', ', ebkey), ')' ) as label \
             , 'feature' as origin \
-            , remove_accents(concat_ws(' ', ebkey, ort, ebkey_old)) as detail \
+            , remove_accents(concat_ws(' ', ebkey, ebkey_old)) as detail \
             , 'ch.swisstopo.lubis-luftbilder_farbe' as layer \
             , bgdi_quadindex as geom_quadindex \
             , st_y(st_transform(st_centroid(the_geom),4326)) as lat \
@@ -62,9 +62,9 @@ source src_ch_swisstopo_lubis_luftbilder_schwarzweiss: def_searchable_features_w
     sql_db = lubis_${DBSTAGING}
     sql_query = \
         SELECT row_number() OVER(ORDER BY ebkey asc) as id \
-            , concat(flugdatum, ' ', bildnummer, ' (', concat_ws(', ', ort, ebkey), ')' ) as label \
+            , concat(flugdatum, ' ', feature_id, ' (', concat_ws(', ', ebkey), ')' ) as label \
             , 'feature' as origin \
-            , remove_accents(concat_ws(' ', ebkey, ort, ebkey_old)) as detail \
+            , remove_accents(concat_ws(' ', ebkey, ebkey_old)) as detail \
             , 'ch.swisstopo.lubis-luftbilder_schwarzweiss' as layer \
             , bgdi_quadindex as geom_quadindex \
             , st_y(st_transform(st_centroid(the_geom),4326)) as lat \
@@ -81,9 +81,9 @@ source src_ch_swisstopo_lubis_luftbilder_infrarot: def_searchable_features_with_
     sql_db = lubis_${DBSTAGING}
     sql_query = \
         SELECT row_number() OVER(ORDER BY ebkey asc) as id \
-            , concat(flugdatum, ' ', bildnummer, ' (', concat_ws(', ', ort, ebkey, ebkey_old), ')' ) as label \
+            , concat(flugdatum, ' ', feature_id, ' (', concat_ws(', ', ebkey, ebkey_old), ')' ) as label \
             , 'feature' as origin \
-            , remove_accents(concat_ws(' ', ebkey, ort)) as detail \
+            , remove_accents(ebkey) as detail \
             , 'ch.swisstopo.lubis-luftbilder_infrarot' as layer \
             , bgdi_quadindex as geom_quadindex \
             , st_y(st_transform(st_centroid(the_geom),4326)) as lat \
@@ -140,7 +140,7 @@ source src_ch_swisstopo_lubis_terrestrische_aufnahmen : def_searchable_features_
         SELECT row_number() OVER(ORDER BY inventory_number asc) as id \
             , lpad(bilder.inventory_number::text, 14, '0'::text) as label \
             , 'feature' as origin \
-            , remove_accents(concat_ws(' ', inventory_number, image_number, station, operate_name, year, inventarnummer_old)) as detail \
+            , remove_accents(concat_ws(' ', inventory_number, station, operate_name, year, inventarnummer_old)) as detail \
             , 'ch.swisstopo.lubis-terrestrische_aufnahmen' as layer \
             , bgdi_quadindex as geom_quadindex \
             , st_y(st_transform(st_centroid(the_geom),4326)) as lat \
diff --git a/conf/search.conf.part b/conf/search.conf.part
index 8c28ece..bbc2bfc 100644
--- a/conf/search.conf.part
+++ b/conf/search.conf.part
@@ -405,6 +405,8 @@ index district_metaphone : zipcode
     source = src_district
     path = /var/lib/sphinxsearch/data/index/district_metaphone
     preopen = 0
+    wordforms = /dev/null
+    expand_keywords = 1
 }
 
 index kantone_metaphone : zipcode
@@ -413,6 +415,8 @@ index kantone_metaphone : zipcode
     source = src_kantone
     path = /var/lib/sphinxsearch/data/index/kantone_metaphone
     preopen = 0
+    wordforms = /dev/null
+    expand_keywords = 1
 }
 
 index gg25_metaphone : zipcode
@@ -421,6 +425,8 @@ index gg25_metaphone : zipcode
     source = src_gg25
     path = /var/lib/sphinxsearch/data/index/gg25_metaphone
     preopen = 0
+    wordforms = /dev/null
+    expand_keywords = 1
 }
 
 index swissnames3d_metaphone : zipcode
@@ -429,6 +435,8 @@ index swissnames3d_metaphone : zipcode
     source = src_swissnames3d
     path = /var/lib/sphinxsearch/data/index/swissnames3d_metaphone
     preopen = 0
+    wordforms = /dev/null
+    expand_keywords = 1
 }
 
 index haltestellen_metaphone : zipcode
@@ -437,6 +445,8 @@ index haltestellen_metaphone : zipcode
     source = src_haltestellen
     path = /var/lib/sphinxsearch/data/index/haltestellen_metaphone
     preopen = 0
+    wordforms = /dev/null
+    expand_keywords = 1
 }
 
 index address_metaphone: zipcode
@@ -445,6 +455,8 @@ index address_metaphone: zipcode
     source = src_address
     path = /var/lib/sphinxsearch/data/index/address_metaphone
     preopen = 0
+    wordforms = /dev/null
+    expand_keywords = 1
 }
 
 # only create on demand