diff --git a/administrative.json b/administrative.json
index 607e90f..a376689 100644
--- a/administrative.json
+++ b/administrative.json
@@ -1,4 +1,5 @@
 {
+    "type": "overpass",
     "name": {
         "ast": "Divisiones Alministratives",
         "cs": "Administrativní oblasti",
@@ -12,5 +13,17 @@
         "nl": "Administratieve gebieden",
         "ro": "Zona administrativa",
         "ru": "Административные границы"
+    },
+    "query": {
+        "3": "(\nway[admin_level=2];\nrelation[admin_level=2];\n)",
+        "6": "(\nway[admin_level~\"^(2|3)$\"];\nrelation[admin_level~\"^(2|3)$\"];\n)",
+        "11": "(\nway[admin_level~\"^(2|3|4|5)$\"];\nrelation[admin_level~\"^(2|3|4|5)$\"];\n)",
+        "13": "(\nway[admin_level~\"^(2|3|4|5|6|7)$\"];\nrelation[admin_level~\"^(2|3|4|5|6|7)$\"];\n)",
+        "15": "(\nway[admin_level~\"^(2|3|4|5|6|7|8|9)$\"];\nrelation[admin_level~\"^(2|3|4|5|6|7|8|9)$\"];\n)",
+        "16": "(\nway[admin_level~\"^(2|3|4|5|6|7|8|9|10|11)$\"];\nrelation[admin_level~\"^(2|3|4|5|6|7|8|9|10|11)$\"];\n)"
+    },
+    "feature": {
+        "description": "{{ tagTrans('admin_level', tags.admin_level) }}",
+        "body": "{{ tagTrans('admin_level', tags.admin_level) }}\n<br/>\n{{ keyTrans('admin_level') }}: {{ tags.admin_level }}"
     }
 }
diff --git a/index.json b/index.json
index d3b5233..6955af4 100644
--- a/index.json
+++ b/index.json
@@ -225,10 +225,7 @@
             ]
         },
         {
-            "id": "places"
-        },
-        {
-            "id": "natural"
+            "id": "places_geo"
         }
     ]
 }
diff --git a/places_geo.json b/places_geo.json
new file mode 100644
index 0000000..3eb7f7c
--- /dev/null
+++ b/places_geo.json
@@ -0,0 +1,34 @@
+{
+    "name": {
+        "ast": "Llugares",
+        "cs": "Sídla",
+        "de": "Orte",
+        "el": "Μέρη",
+        "en": "Places",
+        "et": "Kohad",
+        "fr": "Place",
+        "hu": "Helyek",
+        "it": "Luoghi",
+        "ja": "場所",
+        "nl": "Plaatsen",
+        "pl": "Miejsca",
+        "ro": "Locuri",
+        "ru": "Места",
+        "uk": "Місцевість"
+    },
+    "type": "index",
+    "subCategories": [
+        {
+            "id": "places"
+        },
+        {
+            "id": "natural"
+        },
+        {
+            "id": "administrative"
+        },
+        {
+            "id": "residential"
+        }
+    ]
+}
diff --git a/residential.json b/residential.json
index dc5253d..96d4165 100644
--- a/residential.json
+++ b/residential.json
@@ -1,4 +1,5 @@
 {
+    "type": "overpass",
     "name": {
         "ast": "Zones residenciales",
         "cs": "Obytné oblasti",
@@ -14,5 +15,13 @@
         "ro": "Zona rezidentiala",
         "ru": "Жилые районы",
         "uk": "Житлова зона"
+    },
+    "query": {
+        "13": "(\nnode[landuse~\"^(residential)$\"];\nway[landuse~\"^(residential)$\"];\nrelation[landuse~\"^(residential)$\"];\n)",
+        "15": "(\nnode[landuse~\"^(residential|allotments)$\"];\nway[landuse~\"^(residential|allotments)$\"];\nrelation[landuse~\"^(residential|allotments)$\"];\n)"
+    },
+    "feature": {
+        "description": "{{ tagTrans('landuse', tags.landuse) }}",
+        "body": "{{ tagTrans('landuse', tags.landuse) }}"
     }
 }