diff --git a/assets/layers/fixme/fixme.json b/assets/layers/fixme/fixme.json
new file mode 100644
index 000000000..e15cae27a
--- /dev/null
+++ b/assets/layers/fixme/fixme.json
@@ -0,0 +1,54 @@
+{
+  "id": "fixme",
+  "name": {
+    "en": "OSM objects with FIXME tags"
+  },
+  "minzoom": 12,
+  "description": {
+    "en": "OSM objects that likely need to be fixed, based on a FIXME tag."
+  },
+  "shownByDefault": false,
+  "syncSelection": "theme-only",
+  "source": {
+    "osmTags": {
+      "or": [
+        "fixme~*",
+        "FIXME~*"]
+    }
+  },
+  "title": {
+    "render": {
+      "en": "OSM object with FIXME tag"
+    }
+  },
+  "tagRenderings": [
+    {
+      "id": "fixme",
+      "render": {
+        "en": "Fixme Text: {fixme}"
+      }
+    },
+    {
+      "id": "note",
+      "condition": "note~*",
+      "render": {
+        "en": "Note Text: {note}"
+      }
+    },
+    "all_tags"
+  ],
+  "mapRendering": [
+    {
+      "location": [
+        "centroid",
+        "point"
+      ],
+      "icon": "./assets/svg/bug.svg"
+    },
+    {
+      "color": "#ff0000",
+      "dashArray": "5,5",
+      "width": 2
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/layers/note/note.json b/assets/layers/note/note.json
index 7038ae2a8..793e122ad 100644
--- a/assets/layers/note/note.json
+++ b/assets/layers/note/note.json
@@ -8,10 +8,11 @@
   },
   "description": "This layer shows notes on OpenStreetMap. Having this layer in your theme will trigger the 'add new note' functionality in the 'addNewPoint'-popup (or if your theme has no presets, it'll enable adding notes)",
   "source": {
-    "osmTags": "id~*",
+    "osmTags": "date_created~*",
     "geoJson": "https://api.openstreetmap.org/api/0.6/notes.json?limit=10000&closed=7&bbox={x_min},{y_min},{x_max},{y_max}",
     "geoJsonZoomLevel": 12,
-    "maxCacheAge": 0
+    "maxCacheAge": 0,
+    "isOsmCache": false
   },
   "minzoom": 10,
   "title": {
diff --git a/assets/themes/notes/notes.json b/assets/themes/notes/notes.json
index 6d36e8ac7..a5c156e71 100644
--- a/assets/themes/notes/notes.json
+++ b/assets/themes/notes/notes.json
@@ -30,6 +30,7 @@
   "clustering": false,
   "enableDownload": true,
   "layers": [
-    "note"
+    "note",
+    "fixme"
   ]
 }
\ No newline at end of file