diff --git a/poi/poi_types.xml b/poi/poi_types.xml
index 274fce868d..398dfb9786 100644
--- a/poi/poi_types.xml
+++ b/poi/poi_types.xml
@@ -2293,7 +2293,7 @@
 				<poi_reference name="car_sharing"/>
 			</poi_filter>
 			<poi_filter name="public_transport" top="true">
-				<poi_type name="public_transport_platform" tag="public_transport" value="platform" excluded_poi_additional_category="payment_type,fee,shelter_type,tactile_paving,opening_hours">
+				<poi_type name="public_transport_platform" tag="public_transport" value="platform" excluded_poi_additional_category="payment_type,fee,shelter_type,tactile_paving,opening_hours" order="89">
 					<poi_additional_category name="share_taxi">
 						<poi_additional name="share_taxi_yes" tag="share_taxi" value="yes"/>
 					</poi_additional_category>
@@ -2318,7 +2318,7 @@
 				<poi_type name="public_transport_stop_position" tag="public_transport" value="stop_position" no_edit="true" excluded_poi_additional_category="payment_type,fee,internet_access_type,opening_hours"/>
 				<poi_type name="bus_stop" tag="highway" value="bus_stop" excluded_poi_additional_category="payment_type,fee,opening_hours" poi_additional_category="bench,covered,tactile_paving"/>
 				<poi_type name="tram_stop" tag="railway" value="tram_stop" excluded_poi_additional_category="payment_type,fee,opening_hours" poi_additional_category="bench,covered,tactile_paving"/>
-				<poi_type name="public_transport_station" tag="public_transport" value="station"/>
+				<poi_type name="public_transport_station" tag="public_transport" value="station" order="88" />
 				<poi_type name="bus_station" tag="amenity" value="bus_station"/>
 				<poi_type name="railway_station" tag="railway" value="station">
 					<poi_additional_category name="subway_station_filter" icon="subway_station">
diff --git a/test-resources/search/double_parking.json b/test-resources/search/double_parking.json
index e2624ab3fe..6240b302a2 100644
--- a/test-resources/search/double_parking.json
+++ b/test-resources/search/double_parking.json
@@ -14,59 +14,18 @@
 		"Parking (Personal transport) [[1, POI_TYPE, 1.000, 0.00 km]]",
 		"для клиентов [[1, POI, 1.000, 0.03 km]]",
 		"Parking [[1, POI, 1.000, 0.05 km]]",
-		"Parking [[1, POI, 1.000, 0.06 km]]",
-		"Parking [[1, POI, 1.000, 0.11 km]]",
-		"Parking [[1, POI, 1.000, 0.16 km]]",
-		"Parking [[1, POI, 1.000, 0.17 km]]",
-		"Parking [[1, POI, 1.000, 0.23 km]]",
-		"Parking [[1, POI, 1.000, 0.35 km]]",
-		"Parking [[1, POI, 1.000, 0.43 km]]",
-		"Parking [[1, POI, 1.000, 0.44 km]]",
-		"Parking [[1, POI, 1.000, 0.48 km]]",
-		"Parking [[1, POI, 1.000, 0.49 km]]",
-		"Parking [[1, POI, 1.000, 0.55 km]]",
 		"Автостоянка №1 [[1, POI, 1.000, 0.57 km]]",
-		"Parking [[1, POI, 1.000, 0.57 km]]",
-		"Parking [[1, POI, 1.000, 0.60 km]]",
-		"Parking [[1, POI, 1.000, 0.61 km]]",
-		"Parking [[1, POI, 1.000, 0.72 km]]",
-		"Parking [[1, POI, 1.000, 0.81 km]]",
-		"Parking [[1, POI, 1.000, 0.82 km]]",
-		"Parking [[1, POI, 1.000, 0.85 km]]",
-		"Parking [[1, POI, 1.000, 0.90 km]]",
-		"Parking [[1, POI, 1.000, 0.93 km]]",
-		"Parking [[1, POI, 1.000, 0.94 km]]",
-		"Parking [[1, POI, 1.000, 1.02 km]]",
 		"Южная [[1, POI, 1.000, 1.03 km]]",
 		"Заинская ГРЭС [[1, POI, 1.000, 1.06 km]]",
 		"Parking [[1, POI, 1.000, 1.06 km]]",
-		"Parking [[1, POI, 1.000, 1.10 km]]",
-		"Parking [[1, POI, 1.000, 1.11 km]]",
 		"Parking [[1, POI, 1.000, 1.14 km]]",
-		"Parking [[1, POI, 1.000, 1.21 km]]",
-		"Parking [[1, POI, 1.000, 1.21 km]]",
-		"Parking [[1, POI, 1.000, 1.36 km]]",
-		"Parking [[1, POI, 1.000, 1.44 km]]",
 		"Три тополя [[1, POI, 1.000, 1.48 km]]",
 		"Parking [[1, POI, 1.000, 1.52 km]]",
-		"Parking [[1, POI, 1.000, 1.53 km]]",
-		"Parking [[1, POI, 1.000, 1.56 km]]",
-		"Parking [[1, POI, 1.000, 1.62 km]]",
-		"Parking [[1, POI, 1.000, 1.74 km]]",
-		"Parking [[1, POI, 1.000, 1.90 km]]",
 		"Штрафстоянка (Эвакуатор) [[1, POI, 1.000, 2.03 km]]",
 		"для регистрации в ГИБДД [[1, POI, 1.000, 2.06 km]]",
-		"Parking [[1, POI, 1.000, 2.06 km]]",
-		"Parking [[1, POI, 1.000, 2.06 km]]",
-		"Parking [[1, POI, 1.000, 2.07 km]]",
 		"для техосмотра [[1, POI, 1.000, 2.09 km]]",
-		"Parking [[1, POI, 1.000, 2.18 km]]",
 		"Parking [[1, POI, 1.000, 2.51 km]]",
-		"Parking [[1, POI, 1.000, 2.55 km]]",
 		"Parking [[1, POI, 1.000, 3.41 km]]",
-		"Parking [[1, POI, 1.000, 3.42 km]]",
-		"Parking [[1, POI, 1.000, 3.42 km]]",
-		"Parking [[1, POI, 1.000, 3.45 km]]",
 		"Parking [[1, POI, 1.000, 4.29 km]]",
 		"Parking [[1, POI, 1.000, 6.70 km]]",
 		"TZK \"Tatneft\" parking [[1, POI, 1.000, 175.83 km]]",
diff --git a/test-resources/search/estrado.json b/test-resources/search/estrado.json
index 70c85e228e..02625edd77 100644
--- a/test-resources/search/estrado.json
+++ b/test-resources/search/estrado.json
@@ -23,9 +23,7 @@
            "Harderwijk, estr.obf [[1, CITY, 70.000, 0.91 km]]",
            "Harderwijk [[1, POI, 60.000, 0.80 km]]",
            "Harderwijk [[1, POI, 60.000, 0.86 km]]",
-           "Harderwijk [[1, POI, 60.000, 0.87 km]]",
            "Harderwijk [[1, POI, 60.000, 1.24 km]]",
-           "Harderwijk [[1, POI, 60.000, 1.52 km]]",
            "Harderwijk [[1, POI, 60.000, 1.67 km]]",
            "Carwash Harderwijk [[1, POI, 10.000, 0.14 km]]",
            "Skeelerbaan Harderwijk [[1, POI, 10.000, 0.16 km]]",
@@ -36,10 +34,8 @@
            "Van Wijnen Harderwijk [[1, POI, 10.000, 0.74 km]]",
            "Harderwijk, Station [[1, POI, 10.000, 0.77 km]]",
            "Dental Clinics Harderwijk Tweelingstad [[1, POI, 10.000, 0.79 km]]",
-           "Harderwijk, Station [[1, POI, 10.000, 0.80 km]]",
            "Dental Clinics Harderwijk [[1, POI, 10.000, 0.81 km]]",
            "Politie Harderwijk [[1, POI, 10.000, 0.82 km]]",
-           "Harderwijk, Station [[1, POI, 10.000, 0.84 km]]",
            "Telecom Harderwijk [[1, POI, 10.000, 0.84 km]]",
            "Zonnestudio Zonice Harderwijk [[1, POI, 10.000, 0.86 km]]",
            "Trendz Harderwijk [[1, POI, 10.000, 0.88 km]]",
diff --git a/test-resources/search/ge2.json b/test-resources/search/ge2.json
index 1452422488..77d9ab5461 100644
--- a/test-resources/search/ge2.json
+++ b/test-resources/search/ge2.json
@@ -57,8 +57,7 @@
       "Beutelsbacher Straße, Aichelberg [[2, STREET, 3.000, 7.54 km]]",
       "Beutelsbacher - / Daimler Straße, Grunbach [[2, STREET, 3.000, 8.08 km]]",
       "Beutelsbacher Straße, Grunbach [[2, STREET, 3.000, 8.14 km]]",
-      "Beutelsbacher Straße [[2, POI, 1.000, 7.91 km]]",
-      "Beutelsbacher Straße [[2, POI, 1.000, 8.09 km]]",
+      "Beutelsbacher Straße [[2, POI, 1.000, 7.91 km]]"
     ],
     [
       "15, Blumenstraße, Esslingen am Neckar [[3, HOUSE, 90.802, 8.25 km]]",
diff --git a/test-resources/search/interpolation_by_alphabet.json b/test-resources/search/interpolation_by_alphabet.json
index ea5b7471c8..adc4d0a19f 100644
--- a/test-resources/search/interpolation_by_alphabet.json
+++ b/test-resources/search/interpolation_by_alphabet.json
@@ -16,7 +16,6 @@
         "Via Passatore [[2, POI, 1.000, 0.13 km]]",
         "Via Passatore 29 [[2, POI, 1.000, 0.14 km]]",
         "Farmacia del Passatore [[2, POI, 1.000, 0.17 km]]",
-        "Via Valle Maira / bivio Passatore [[2, POI, 1.000, 0.46 km]]",
-        "Via Valle Maira / bivio Passatore [[2, POI, 1.000, 0.49 km]]"
+        "Via Valle Maira / bivio Passatore [[2, POI, 1.000, 0.46 km]]"
     ]
   }
\ No newline at end of file
diff --git a/test-resources/search/nearest_pois.json b/test-resources/search/nearest_pois.json
index e29c3b4719..c3e4a021b6 100644
--- a/test-resources/search/nearest_pois.json
+++ b/test-resources/search/nearest_pois.json
@@ -49,7 +49,6 @@
             "Yamaha [[1, POI, 1.000, 0.04 km]]",
             "Stairs [[1, POI, 1.000, 0.05 km]]",
             "Fountain [[1, POI, 1.000, 0.05 km]]",
-            "Stairs [[1, POI, 1.000, 0.05 km]]",
             "Майдан Незалежності [[1, POI, 1.000, 0.05 km]]",
             "Tunnel [[1, POI, 1.000, 0.05 km]]",
             "Поліцейський пост [[1, POI, 1.000, 0.05 km]]",
@@ -57,7 +56,6 @@
             "Tunnel [[1, POI, 1.000, 0.06 km]]",
             "Глобус (1 лінія) [[1, POI, 1.000, 0.06 km]]",
             "Біла ромашка [[1, POI, 1.000, 0.06 km]]",
-            "Майдан Незалежності [[1, POI, 1.000, 0.06 km]]",
             "Stop light [[1, POI, 1.000, 0.07 km]]",
             "Hostel [[1, POI, 1.000, 0.07 km]]",
             "Пузата Хата [[1, POI, 1.000, 0.07 km]]",
diff --git a/test-resources/search/rolandstr.json b/test-resources/search/rolandstr.json
index 248e083811..cc778103ce 100644
--- a/test-resources/search/rolandstr.json
+++ b/test-resources/search/rolandstr.json
@@ -31,8 +31,6 @@
 			"Rolandstraße (Marienberg), Übach-Palenberg [[1, STREET, 1.000, 16.09 km]]",
 			"Rolandstraße [[1, POI, 1.000, 0.03 km]]",
 			"Rolandstraße [[1, POI, 1.000, 0.21 km]]",
-			"Rolandstraße [[1, POI, 1.000, 0.68 km]]",
-			"Rolandstraße [[1, POI, 1.000, 0.70 km]]",
 			"Rolandstraße [[1, POI, 1.000, 4.90 km]]",
 			"Rolandstraße [[1, POI, 1.000, 4.92 km]]"
 		],
@@ -50,8 +48,6 @@
 			"Rolandstraße (Marienberg), Übach-Palenberg [[1, STREET, 3.000, 16.09 km]]",
 			"Rolandstraße [[1, POI, 1.000, 0.03 km]]",
 			"Rolandstraße [[1, POI, 1.000, 0.21 km]]",
-			"Rolandstraße [[1, POI, 1.000, 0.68 km]]",
-			"Rolandstraße [[1, POI, 1.000, 0.70 km]]",
 			"Rolandstraße [[1, POI, 1.000, 4.90 km]]",
 			"Rolandstraße [[1, POI, 1.000, 4.92 km]]"
 		],
@@ -69,8 +65,6 @@
 			"Rolandstraße (Marienberg), Übach-Palenberg [[1, STREET, 3.000, 16.09 km]]",
 			"Rolandstraße [[1, POI, 1.000, 0.03 km]]",
 			"Rolandstraße [[1, POI, 1.000, 0.21 km]]",
-			"Rolandstraße [[1, POI, 1.000, 0.68 km]]",
-			"Rolandstraße [[1, POI, 1.000, 0.70 km]]",
 			"Rolandstraße [[1, POI, 1.000, 4.90 km]]",
 			"Rolandstraße [[1, POI, 1.000, 4.92 km]]"
 		],
@@ -88,8 +82,6 @@
 			"Rolandstraße (Marienberg), Übach-Palenberg [[1, STREET, 1.000, 16.09 km]]",
 			"Rolandstraße [[1, POI, 1.000, 0.03 km]]",
 			"Rolandstraße [[1, POI, 1.000, 0.21 km]]",
-			"Rolandstraße [[1, POI, 1.000, 0.68 km]]",
-			"Rolandstraße [[1, POI, 1.000, 0.70 km]]",
 			"Rolandstraße [[1, POI, 1.000, 4.90 km]]",
 			"Rolandstraße [[1, POI, 1.000, 4.92 km]]"
 		],
@@ -107,8 +99,6 @@
 			"Rolandstraße (Marienberg), Übach-Palenberg [[1, STREET, 3.000, 16.09 km]]",
 			"Rolandstraße [[1, POI, 1.000, 0.03 km]]",
 			"Rolandstraße [[1, POI, 1.000, 0.21 km]]",
-			"Rolandstraße [[1, POI, 1.000, 0.68 km]]",
-			"Rolandstraße [[1, POI, 1.000, 0.70 km]]",
 			"Rolandstraße [[1, POI, 1.000, 4.90 km]]",
 			"Rolandstraße [[1, POI, 1.000, 4.92 km]]"
 		]
diff --git a/test-resources/search/rossio.json b/test-resources/search/rossio.json
index ec05289561..2c67a96866 100644
--- a/test-resources/search/rossio.json
+++ b/test-resources/search/rossio.json
@@ -14,17 +14,10 @@
         "rossio "
     ],
     "results": [
-		"Rossio [[1, POI, 60.000, 0.05 km]]",
-		"Rossio [[1, POI, 60.000, 0.09 km]]",
-		"Rossio [[1, POI, 60.000, 0.12 km]]",
 		"Rossio (Santa Justa), Santa Maria Maior [[1, STREET, 60.000, 0.13 km]]",
-		"Rossio [[1, POI, 60.000, 0.13 km]]",
-		"Rossio [[1, POI, 60.000, 0.15 km]]",
+		"Rossio [[1, POI, 60.000, 0.14 km]]",
 		"Rossio (Centro) [[1, POI, 60.000, 0.16 km]]",
-		"Rossio [[1, POI, 60.000, 0.17 km]]",
 		"Rossio [[1, POI, 60.000, 0.18 km]]",
-		"Rossio [[1, POI, 60.000, 0.20 km]]",
-		"Rossio [[1, POI, 60.000, 0.24 km]]",
 		"Rossio, Barreiro [[1, STREET, 60.000, 8.34 km]]",
 		"Rossio, rossio.obf [[1, CITY, 60.000, 92.60 km]]",
 		"Rossio [[1, POI, 60.000, 15.96 km]]",
diff --git a/test-resources/search/saintLys.json b/test-resources/search/saintLys.json
index 2b3bf1a44b..b25577c732 100644
--- a/test-resources/search/saintLys.json
+++ b/test-resources/search/saintLys.json
@@ -27,7 +27,6 @@
             "Ancienne gare de Saint-Lys [[1, POI, 10.000, 0.28 km]]",
             "Collège Saint-Lys [[1, POI, 10.000, 0.55 km]]",
             "MJC  Saint-Lys [[1, POI, 10.000, 0.57 km]]",
-            "Collège Saint-Lys [[1, POI, 10.000, 0.60 km]]",
             "Sourdeval - Saint-Lys [[1, POI, 10.000, 0.62 km]]",
             "Gendarmerie nationale [[1, POI, 10.000, 0.64 km]]",
             "Centre d'incendie et de secours de Saint-Lys [[1, POI, 10.000, 1.23 km]]",
@@ -48,7 +47,6 @@
             "Ancienne gare de Saint-Lys [[2, POI, 10.000, 0.28 km]]",
             "Collège Saint-Lys [[2, POI, 10.000, 0.55 km]]",
             "MJC  Saint-Lys [[2, POI, 10.000, 0.57 km]]",
-            "Collège Saint-Lys [[2, POI, 10.000, 0.60 km]]",
             "Sourdeval - Saint-Lys [[2, POI, 10.000, 0.62 km]]",
             "Gendarmerie nationale [[2, POI, 10.000, 0.64 km]]",
             "La Table de Saint Lys [[2, POI, 10.000, 0.95 km]]",
@@ -77,7 +75,6 @@
             "Ancienne gare de Saint-Lys [[1, POI, 10.000, 0.28 km]]",
             "Collège Saint-Lys [[1, POI, 10.000, 0.55 km]]",
             "MJC  Saint-Lys [[1, POI, 10.000, 0.57 km]]",
-            "Collège Saint-Lys [[1, POI, 10.000, 0.60 km]]",
             "Pharmacie Du Lys [[1, POI, 10.000, 0.61 km]]",
             "Sourdeval - Saint-Lys [[1, POI, 10.000, 0.62 km]]",
             "Gendarmerie nationale [[1, POI, 10.000, 0.64 km]]",
diff --git a/test-resources/search/street_santa_clara.json b/test-resources/search/street_santa_clara.json
index 2995601f5f..b4cd910389 100644
--- a/test-resources/search/street_santa_clara.json
+++ b/test-resources/search/street_santa_clara.json
@@ -27,7 +27,6 @@
 		"CAP SANTA CLARA [[2, POI, 10.000, 45.64 km]]",
 		"CAP Santa Clara [[2, POI, 10.000, 45.64 km]]",
 		"Carrer de Santa Clara, Girona [[2, STREET, 10.000, 45.73 km]]",
-		"L11 - Santa Clara [[2, POI, 10.000, 45.75 km]]",
 		"Santa Clara [[2, POI, 10.000, 47.32 km]]",
 		"Plaça de Santa Clara [[2, POI, 10.000, 47.61 km]]",
 		"Pl. Santa Clara [[2, POI, 10.000, 47.62 km]]",