diff --git a/assets/layers/love_hotel/love_hotel.json b/assets/layers/love_hotel/love_hotel.json
new file mode 100644
index 000000000..4c367df52
--- /dev/null
+++ b/assets/layers/love_hotel/love_hotel.json
@@ -0,0 +1,80 @@
+{
+  "credits": "Asteliks",
+  "minzoom": 10,
+  "pointRendering": [
+    {
+      "location": [
+        "point",
+        "centroid"
+      ],
+      "marker": [
+        {
+          "icon": "circle",
+          "color": "white"
+        },
+        {
+          "icon": "ring",
+          "color": "blue"
+        }
+      ]
+    },
+    {
+      "location": [
+        "point",
+        "centroid"
+      ],
+      "marker": [
+        {
+          "icon": "./assets/layers/hotel/hotel.svg"
+        }
+      ],
+      "iconSize": "27,27"
+    }
+  ],
+  "tagRenderings": [
+    "images",
+    "reviews",
+    {
+      "id": "name",
+      "question": {
+        "en": "What is the name of this love hotel?"
+      },
+      "render": {
+        "en": "This love hotel is named <b>{name}</b>"
+      },
+      "freeform": {
+        "key": "name"
+      }
+    },
+    "contact"
+  ],
+  "lineRendering": [],
+  "id": "love_hotel",
+  "name": {
+    "en": "Love hotels"
+  },
+  "description": {
+    "en": "A love hotel is a type of short-stay hotel found around the world operated primarily for the purpose of allowing guests privacy for sexual activities"
+  },
+  "source": {
+    "osmTags": "amenity=love_hotel"
+  },
+  "title": {
+    "render": {
+      "en": "Love Hotel <i>{name}</i>"
+    }
+  },
+  "presets": [
+    {
+      "title": {
+        "en": "a love hotel"
+      },
+      "description": {
+        "en": "A love hotel is a type of short-stay hotel found around the world operated primarily for the purpose of allowing guests privacy for sexual activities."
+      },
+      "tags": [
+        "amenity=love_hotel"
+      ]
+    }
+  ]
+}
diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json
index 727419ee1..357608671 100644
--- a/assets/layers/shops/shops.json
+++ b/assets/layers/shops/shops.json
@@ -109,6 +109,16 @@
             "override": {
               "render": "./assets/layers/id_presets/maki-shop.svg",
               "+mappings": [
+                {
+                  "#": "Layer icon rendering",
+                  "if": {
+                    "or":["shop=yes", {"and": [
+                      "shop!=yes",
+                      "id="
+                    ]}]
+                  },
+                  "then": "./assets/layers/id_presets/maki-shop.svg"
+                },
                 {
                   "if": {
                     "or": [
@@ -128,11 +138,6 @@
                 {
                   "if": "craft=key_cutter",
                   "then": "./assets/layers/id_presets/fas-key.svg"
-                },
-                {
-                  "#": "Layer icon rendering",
-                  "if": "id=",
-                  "then": "./assets/layers/id_presets/maki-shop.svg"
                 }
               ]
             }
diff --git a/assets/themes/openlovemap/openlovemap.json b/assets/themes/openlovemap/openlovemap.json
index 2fd24944b..494ea8d8a 100644
--- a/assets/themes/openlovemap/openlovemap.json
+++ b/assets/themes/openlovemap/openlovemap.json
@@ -22,6 +22,9 @@
         "=filter": [
           "open_now"
         ],
+        "name": {
+          "en": "Erotic shops"
+        },
         "=presets": [
           {
             "title": {
@@ -39,7 +42,10 @@
       "override": {
         "minzoom": 18,
         "=presets": [],
-        "=name": null
+        "=name": null,
+        "=filter": {
+          "sameAs": "erotic-shop"
+        }
       }
     },
     {
@@ -112,7 +118,6 @@
       "=name": null
       }
     },
-
     {
       "builtin": "cinema",
       "hideTagRenderingsWithLabels": ["wikipedia"],
@@ -184,6 +189,33 @@
         "=presets": [],
        "=name": null
       }
+    },
+    "love_hotel",
+    {
+      "builtin": "hotel",
+      "override": {
+      "minzoom": 17,
+        "+tagRenderings": [
+          {
+            "id": "hotel-type",
+            "question": {
+              "en": "What type of hotel is this?"
+            },
+            "mappings": [
+              {
+                "if": "tourism=hotel",
+                "then": "This is a regular, tourist hotel where people stay multiple days",
+                "addExtraTags": ["amenity="]
+              },
+              {
+                "if": "amenity=love_hotel",
+                "then": "This is a love hotel where people rent rooms for sexual activity. The hotel rent rooms for a few days",
+                "addExtraTags": ["tourism="]
+              }
+            ]
+          }],
+        "=presets": []
+      }
     }
   ],
   "overrideAll": {