diff --git a/data/classificator.txt b/data/classificator.txt
index 18c2377c83..24de537030 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -213,43 +213,43 @@ world  +
             [religion]  -
             christian  14|1|1|4  15|1|1|4  16|1|1|4  17|1|1|4  -
             {}
-        hospital  14|2|12|566  15|2|17|753  16|2|24|1361  17|2|29|1526  -
-        shelter  14|2|14|568  14|2|15|569  15|2|19|755  15|2|20|756  16|2|27|1364  16|2|28|1365  17|2|65|1576  17|2|66|1577  -
-        fountain  16|1|21|67  16|2|29|1366  17|1|22|71  17|2|75|1587  -
-        bus_station  16|2|22|1359  17|2|26|1520  -
-        speed_trap  16|2|25|1362  17|2|34|1531  -
-        doctors  17|2|30|1527  -
-        pharmacy  17|2|31|1528  -
-        post_office  17|2|32|1529  -
-        post_box  17|2|33|1530  -
-        pub  17|2|35|1532  -
-        bar  17|2|36|1533  -
-        cafe  17|2|37|1534  -
-        restaurant  17|2|39|1536  +
+        hospital  14|2|12|566  15|2|17|753  16|2|24|1361  17|2|29|1526  17|3|19|11829  -
+        shelter  14|2|14|568  14|2|15|569  15|2|19|755  15|2|20|756  16|2|27|1364  16|2|28|1365  17|2|65|1576  17|2|66|1577  17|3|19|11829  -
+        fountain  16|1|21|67  16|2|29|1366  17|1|22|71  17|2|75|1587  17|3|19|11829  -
+        bus_station  16|2|22|1359  17|2|26|1520  17|3|19|11829  -
+        speed_trap  16|2|25|1362  17|2|34|1531  17|3|19|11829  -
+        doctors  17|2|30|1527  17|3|19|11829  -
+        pharmacy  17|2|31|1528  17|3|19|11829  -
+        post_office  17|2|32|1529  17|3|19|11829  -
+        post_box  17|2|33|1530  17|3|19|11829  -
+        pub  17|2|35|1532  17|3|19|11829  -
+        bar  17|2|36|1533  17|3|19|11829  -
+        cafe  17|2|37|1534  17|3|19|11829  -
+        restaurant  17|2|39|1536  17|3|19|11829  +
             [tourism]  -
             hotel  17|2|38|1535  -
             [cuisine]  -
             vegetarian  17|4|6|1537  -
             vegan  17|4|6|1538  -
             {}
-        cinema  17|2|40|1539  -
-        theatre  17|2|41|1540  -
-        place_of_worship  17|2|45|1544  -
-        bench  17|2|47|1546  -
-        hunting_stand  17|2|67|1578  -
-        library  17|2|69|1581  -
-        fire_station  17|2|70|1582  -
-        fuel  17|2|71|1583  -
-        bicycle_rental  17|2|72|1584  -
-        recycling  17|2|73|1585  -
-        toilets  17|2|74|1586  -
-        drinking_water  17|2|76|1588  -
-        bank  17|2|77|1589  -
-        atm  17|2|78|1590  -
-        bureau_de_change  17|2|79|1591  -
-        car_sharing  17|2|80|1592  -
-        telephone  17|2|81|1593  -
-        fast_food  17|2|82|1594  -
+        cinema  17|2|40|1539  17|3|19|11829 -
+        theatre  17|2|41|1540  17|3|19|11829 -
+        place_of_worship  17|2|45|1544  17|3|19|11829  -
+        bench  17|2|47|1546  17|3|19|11829  -
+        hunting_stand  17|2|67|1578  17|3|19|11829  -
+        library  17|2|69|1581  17|3|19|11829  -
+        fire_station  17|2|70|1582  17|3|19|11829  -
+        fuel  17|2|71|1583  17|3|19|11829  -
+        bicycle_rental  17|2|72|1584  17|3|19|11829  -
+        recycling  17|2|73|1585  17|3|19|11829  -
+        toilets  17|2|74|1586  17|3|19|11829  -
+        drinking_water  17|2|76|1588  17|3|19|11829  -
+        bank  17|2|77|1589  17|3|19|11829  -
+        atm  17|2|78|1590  17|3|19|11829  -
+        bureau_de_change  17|2|79|1591  17|3|19|11829  -
+        car_sharing  17|2|80|1592  17|3|19|11829  -
+        telephone  17|2|81|1593  17|3|19|11829  -
+        fast_food  17|2|82|1594  17|3|19|11829  -
         {}
     leisure  +
         park  6|1|5|19  7|1|5|20  8|1|5|20  9|1|5|20  10|1|5|20  11|1|5|20  12|1|8|20  13|1|11|25  14|1|16|46  15|1|16|46  16|1|16|46  17|1|16|46  +
@@ -1005,13 +1005,13 @@ world  +
         even  17|0|4|92  -
         all  17|0|5|93  -
         {}
-    shop  +
+    shop  17|3|19|11829  +
         bakery  17|2|62|1573  -
         hairdresser  17|2|63|1574  -
         {}
     historic  +
-        battlefield  17|2|68|1579  -
-        museum  17|2|118|1636  17|1|81|1637  17|2|119|1638  -
+        battlefield  17|2|68|1579  17|3|19|11829  -
+        museum  17|2|118|1636  17|1|81|1637  17|2|119|1638  17|3|19|11829  -
         {}
     military  +
         bunker  17|2|68|1580  -