diff --git a/parsed-landmarks/analysis-stage-2/all_config_v3-t1_interactive b/parsed-landmarks/analysis-stage-2/all_config_v3-t1_interactive
index 7290af4..8bc3cc0 100644
--- a/parsed-landmarks/analysis-stage-2/all_config_v3-t1_interactive
+++ b/parsed-landmarks/analysis-stage-2/all_config_v3-t1_interactive
@@ -181,7 +181,9 @@
         ],
         "semantic_required_any": [
           {
-            "amenity": "drinking_water"
+            "man_made":"water_tap",
+            "amenity":"drinking_water",
+            "drinking_water":"yes"
           }
         ],
         "semantic_preferred_any": [],
@@ -206,7 +208,9 @@
       },
       "postprocess": {
         "add_tags": {
-          "amenity": "drinking_water"
+          "man_made":"water_tap",
+"amenity":"drinking_water",
+"drinking_water":"yes"
         },
         "remove_tags": []
       },
@@ -240,7 +244,9 @@
           "raw_type": "0x64:0x14",
           "point_group_key": "raw:0x64:0x14",
           "semantic_tags": {
-            "amenity": "drinking_water"
+            "man_made":"water_tap",
+            "amenity":"drinking_water",
+            "drinking_water":"yes"
           },
           "gpxsee_classes": [
             "poi"
@@ -255,7 +261,9 @@
           "raw_type": "0x64:0x14",
           "point_group_key": "raw:0x64:0x14",
           "semantic_tags": {
-            "amenity": "drinking_water"
+            "man_made":"water_tap",
+"amenity":"drinking_water",
+"drinking_water":"yes"
           },
           "gpxsee_classes": [
             "poi"
@@ -270,7 +278,9 @@
           "raw_type": "0x64:0x14",
           "point_group_key": "raw:0x64:0x14",
           "semantic_tags": {
-            "amenity": "drinking_water",
+            "man_made":"water_tap",
+"amenity":"drinking_water",
+"drinking_water":"yes",
             "name": "Узунски кладенец"
           },
           "gpxsee_classes": [
@@ -286,7 +296,9 @@
           "raw_type": "0x64:0x14",
           "point_group_key": "raw:0x64:0x14",
           "semantic_tags": {
-            "amenity": "drinking_water",
+            "man_made":"water_tap",
+            "amenity":"drinking_water",
+            "drinking_water":"yes",
             "name": "силна"
           },
           "gpxsee_classes": [