diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000..883b1ca9
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+github: [octocat, surftocat]
+custom: ["https://www.paypal.me/strukturart"]
diff --git a/FUNDING.yml b/FUNDING.yml
new file mode 100644
index 00000000..3262f38d
--- /dev/null
+++ b/FUNDING.yml
@@ -0,0 +1,2 @@
+github: [strukturart]
+custom: ["https://www.paypal.me/strukturart"]
diff --git a/application/assets/js/overpass.js b/application/assets/js/overpass.js
index 84a9e944..ee5be397 100644
--- a/application/assets/js/overpass.js
+++ b/application/assets/js/overpass.js
@@ -41,7 +41,7 @@ const overpass = (() => {
       node_query = `[${part1}][${part2}]`;
     }
 
-    if (overpassQuery.indexOf("public_transport") > -1) {
+    if (overpassQuery == "public_transport") {
       node_query = "['public_transport'='stop_position']['bus'='yes']";
       relation_query = "['type'='route']['route'='bus']";
       way_query = "['public_transport'='stop_platform']['bus'='yes']";
diff --git a/application/index.js b/application/index.js
index f1039e25..0e2cd4ee 100644
--- a/application/index.js
+++ b/application/index.js
@@ -424,7 +424,7 @@ document.addEventListener("DOMContentLoaded", function () {
       .querySelector("div#overpass")
       .insertAdjacentHTML(
         "afterend",
-        '<div class="item"  data-type="overpass" data-url="amenity=shelter,shelter_type!~public_transports">Shelter</div>'
+        '<div class="item"  data-type="overpass" data-url="amenity=shelter,shelter_type!=public_transport">Shelter</div>'
       );
 
     find_gpx();
diff --git a/application/manifest.webapp b/application/manifest.webapp
index d7f94793..77bbfb22 100644
--- a/application/manifest.webapp
+++ b/application/manifest.webapp
@@ -1,5 +1,5 @@
   {
-  "version": "1.9.798",
+  "version": "1.9.799",
   "version_name": "hotline",
   "name": "o.map",
   "description": "O.map, your ultimate navigation companion for KaiOS-powered devices. O.map is a lightweight and feature-rich map application designed specifically for KaiOS, enabling you to explore and navigate the world with ease. Whether you're a local resident, a tourist, or an adventurer, O.map is here to enhance your journey and keep you on the right track.",
diff --git a/docs/assets/js/overpass.js b/docs/assets/js/overpass.js
index 4c4e9c41..ee5be397 100644
--- a/docs/assets/js/overpass.js
+++ b/docs/assets/js/overpass.js
@@ -26,7 +26,22 @@ const overpass = (() => {
     let relation_query = "[" + overpassQuery + "]";
     let way_query = "[" + overpassQuery + "]";
     let node_query = "[" + overpassQuery + "]";
-    if (overpassQuery.indexOf("public_transport") > -1) {
+
+    if (overpassQuery.indexOf(",") > -1) {
+      // Split the query by comma
+      let parts = overpassQuery.split(",");
+
+      // Trim whitespace from each part
+      let part1 = parts[0].trim();
+      let part2 = parts[1].trim();
+
+      // Construct the queries
+      relation_query = `[${part1}][${part2}]`;
+      way_query = `[${part1}][${part2}]`;
+      node_query = `[${part1}][${part2}]`;
+    }
+
+    if (overpassQuery == "public_transport") {
       node_query = "['public_transport'='stop_position']['bus'='yes']";
       relation_query = "['type'='route']['route'='bus']";
       way_query = "['public_transport'='stop_platform']['bus'='yes']";
diff --git a/docs/index.js b/docs/index.js
index f1f9c5a7..0e2cd4ee 100644
--- a/docs/index.js
+++ b/docs/index.js
@@ -424,7 +424,7 @@ document.addEventListener("DOMContentLoaded", function () {
       .querySelector("div#overpass")
       .insertAdjacentHTML(
         "afterend",
-        '<div class="item"  data-type="overpass" data-url="amenity=shelter">Shelter</div>'
+        '<div class="item"  data-type="overpass" data-url="amenity=shelter,shelter_type!=public_transport">Shelter</div>'
       );
 
     find_gpx();