diff --git a/assets/layers/hydrant/hydrant.json b/assets/layers/hydrant/hydrant.json
index 8cfe4665d..7aed6ef4a 100644
--- a/assets/layers/hydrant/hydrant.json
+++ b/assets/layers/hydrant/hydrant.json
@@ -547,6 +547,10 @@
     },
     "images"
   ],
+  "allowMove": {
+    "enableRelocation": false,
+    "enableImproveAccuracy": true
+  },
   "units": [
     {
       "fire_hydrant:diameter": {
@@ -556,9 +560,5 @@
         ]
       }
     }
-  ],
-  "allowMove": {
-    "enableRelocation": false,
-    "enableImproveAccuracy": true
-  }
+  ]
 }
diff --git a/assets/layers/love_hotel/love_hotel.json b/assets/layers/love_hotel/love_hotel.json
index 4c367df52..1d8df35b8 100644
--- a/assets/layers/love_hotel/love_hotel.json
+++ b/assets/layers/love_hotel/love_hotel.json
@@ -1,6 +1,20 @@
 {
-  "credits": "Asteliks",
+  "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"
+  },
   "minzoom": 10,
+  "title": {
+    "render": {
+      "en": "Love Hotel <i>{name}</i>"
+    }
+  },
   "pointRendering": [
     {
       "location": [
@@ -31,6 +45,20 @@
       "iconSize": "27,27"
     }
   ],
+  "lineRendering": [],
+  "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"
+      ]
+    }
+  ],
   "tagRenderings": [
     "images",
     "reviews",
@@ -48,33 +76,5 @@
     },
     "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"
-      ]
-    }
-  ]
+  "credits": "Asteliks"
 }
diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json
index 357608671..d41defa33 100644
--- a/assets/layers/shops/shops.json
+++ b/assets/layers/shops/shops.json
@@ -112,10 +112,15 @@
                 {
                   "#": "Layer icon rendering",
                   "if": {
-                    "or":["shop=yes", {"and": [
-                      "shop!=yes",
-                      "id="
-                    ]}]
+                    "or": [
+                      "shop=yes",
+                      {
+                        "and": [
+                          "shop!=yes",
+                          "id="
+                        ]
+                      }
+                    ]
                   },
                   "then": "./assets/layers/id_presets/maki-shop.svg"
                 },
diff --git a/assets/themes/openlovemap/openlovemap.json b/assets/themes/openlovemap/openlovemap.json
index 494ea8d8a..d7a1a42df 100644
--- a/assets/themes/openlovemap/openlovemap.json
+++ b/assets/themes/openlovemap/openlovemap.json
@@ -1,6 +1,5 @@
 {
   "id": "openlovemap",
-  "hideFromOverview": true,
   "title": {
     "en": "Open Love Map"
   },
@@ -8,6 +7,7 @@
     "en": "<p><i>Love in the palm of your hand</i></p>Open Love Map lists various adult entries, such as brothels, erotic stores and stripclubs."
   },
   "icon": "./assets/layers/stripclub/stripclub.svg",
+  "hideFromOverview": true,
   "layers": [
     "brothel",
     "stripclub",
@@ -115,12 +115,14 @@
       "override": {
         "minzoom": 18,
         "=presets": [],
-      "=name": null
+        "=name": null
       }
     },
     {
       "builtin": "cinema",
-      "hideTagRenderingsWithLabels": ["wikipedia"],
+      "hideTagRenderingsWithLabels": [
+        "wikipedia"
+      ],
       "override": {
         "id": "erotic_cinema",
         "pointRendering": [
@@ -159,7 +161,9 @@
         "=filter": [
           "open_now"
         ],
-        "tagRenderings+": ["opening_hours"],
+        "tagRenderings+": [
+          "opening_hours"
+        ],
         "source": {
           "osmTags": {
             "=and": [
@@ -187,14 +191,14 @@
       "override": {
         "minzoom": 18,
         "=presets": [],
-       "=name": null
+        "=name": null
       }
     },
     "love_hotel",
     {
       "builtin": "hotel",
       "override": {
-      "minzoom": 17,
+        "minzoom": 17,
         "+tagRenderings": [
           {
             "id": "hotel-type",
@@ -205,38 +209,45 @@
               {
                 "if": "tourism=hotel",
                 "then": "This is a regular, tourist hotel where people stay multiple days",
-                "addExtraTags": ["amenity="]
+                "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="]
+                "addExtraTags": [
+                  "tourism="
+                ]
               }
             ]
-          }],
+          }
+        ],
         "=presets": []
       }
     }
   ],
   "overrideAll": {
-    "tagRenderings+": [{
-      "id": "has_video_booth",
-      "question": {"en": 
-        "Does {title()} have a private video booth?"
-      },
-      "questionHint": {
-        "en": "This is for use by a single person."
-      },
-      "mappings": [
-        {
-          "if": "service:private_video_booth=yes",
-          "then": "Private video booths are available"
+    "tagRenderings+": [
+      {
+        "id": "has_video_booth",
+        "question": {
+          "en": "Does {title()} have a private video booth?"
         },
-        {
-          "if": "service:private_video_booth=no",
-          "then": "No private video booths"
-        }
-      ]
-    }]
+        "questionHint": {
+          "en": "This is for use by a single person."
+        },
+        "mappings": [
+          {
+            "if": "service:private_video_booth=yes",
+            "then": "Private video booths are available"
+          },
+          {
+            "if": "service:private_video_booth=no",
+            "then": "No private video booths"
+          }
+        ]
+      }
+    ]
   }
 }