diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..b88a67a7f0
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: weekly
diff --git a/.github/workflows/daily_update.yml b/.github/workflows/daily_update.yml
index 715b7d423b..3dcfeff36a 100644
--- a/.github/workflows/daily_update.yml
+++ b/.github/workflows/daily_update.yml
@@ -1,18 +1,18 @@
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 * * * *'
+    - cron: '45 * * * *'
 
 name: daily update
 jobs:
   daily_update:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: 1.17
       - name: build latest binary
@@ -27,7 +27,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          import csv, datetime, glob, os, re, subprocess, sys
+          import csv, datetime, glob, os, random, re, subprocess, sys
 
           MAX_IN_RUN = 3
           STALE_DAYS = 5
@@ -86,6 +86,7 @@ jobs:
           if regenerated:
             subprocess.run('git add *.md _data/locations/*.yml rank_only/*.json && git commit -am "regenerate location pages"', shell=True, check=True)
 
+          random.shuffle(to_process) # in case we're getting failures for a specific preset, this should let others move forward
           for key in to_process[0:MAX_IN_RUN]:
             print("Running: %s" % key)
             preset = flookup[key]
diff --git a/.github/workflows/deploy_badges.yml b/.github/workflows/deploy_badges.yml
index 0f8e6f8b52..68037c9d26 100644
--- a/.github/workflows/deploy_badges.yml
+++ b/.github/workflows/deploy_badges.yml
@@ -8,7 +8,7 @@ jobs:
   deploy_badges:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: deploy updated script/data for badges
         env:
           CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index c3843e0566..b4e40bf553 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -11,10 +11,10 @@ jobs:
   build:
     runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
 
     - name: Set up Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v6
       with:
         go-version: 1.17
 
diff --git a/badges/cloudflare_worker.js b/badges/cloudflare_worker.js
index f4a759b819..d59c59fc0d 100644
--- a/badges/cloudflare_worker.js
+++ b/badges/cloudflare_worker.js
@@ -5,7 +5,8 @@ addEventListener("fetch", event => {
 
 async function handleRequest(request) {
   var path  = new URL(request.url.toString()).pathname
-  var route = path.match(/^\/(?<collection>[a-z_]+)\/(?<login>[^\/\.]+)(\.(?<extension>(svg)))?$/)
+  var route = path.match(/^\/(?<collection>[a-z_]+?)(?:_(?<type>public|private))?\/(?<login>[^\/\.]+)(\.(?<extension>(svg)))?$/)
+  
   if (route == null) {
     if (path == "/") {
       return Response.redirect(BASE_URL+"/#badges")
@@ -13,19 +14,45 @@ async function handleRequest(request) {
       return new Response("Invalid URL requested: "+path, { status: 400 })
     }
   }
-  if (route.groups["collection"] in DATA) {
-    var collection = DATA[route.groups["collection"]]
+  
+  var collectionRaw = route.groups["collection"];
+  var collectionKey = collectionRaw + (route.groups["type"] ? "_" + route.groups["type"] : "")
+
+  if (collectionKey in DATA) {
     if (typeof route.groups["extension"] === "undefined") {
-      return Response.redirect(BASE_URL+"/"+route.groups["collection"]+"#"+route.groups["login"])
+      return Response.redirect(BASE_URL + "/" + collectionKey + "#" + route.groups["login"])
     } else {
-      var rank = 1 + DATA[route.groups["collection"]].indexOf(route.groups["login"])
-      var badge = "committers.top rank-"+(rank == 0 ? "unranked-red" : "#"+rank+"-brightgreen")
-      var request = new Request("https://img.shields.io/badge/"+encodeURIComponent(badge))
-      var response = await fetch(request)
-      return new Response(response.body, response)
+      var rank = 1 + DATA[collectionKey].indexOf(route.groups["login"])
+      var displayName = TITLES[collectionRaw] || ""
+      
+      const COLORS = {
+        0: "FF0000",   // red
+        1: "FFD700",   // gold
+        2: "C0C0C0",   // silver
+        3: "CD7F32"    // bronze
+      };
+
+      const color = COLORS[rank] || "blue";
+
+      // descriptor lookup from captured type
+      const DESCRIPTOR = { default: "public commits", public: "public contributions", private: "all contributions" }
+      var descriptor = DESCRIPTOR[route.groups["type"] || "default"]
+
+      // right-hand message: "#N <DisplayName> (<descriptor>)" or "unranked <DisplayName> (<descriptor>)"
+      var message = displayName + (rank == 0 ? " unranked" : " #" + rank) + " (" + descriptor + ")"
+
+      var label = "committers.top rank"
+
+      var shieldsUrl = "https://img.shields.io/badge/" + encodeURIComponent(label) + "-" + encodeURIComponent(message) + "-" + encodeURIComponent(color) + "?logo=github"
+     
+      var response = await fetch(new Request(shieldsUrl))
+      var result = new Response(response.body, response)
+      result.headers.set('Cache-Control', 'private, max-age=600, must-revalidate')
+     
+      return result
     }
   } else {
-    return new Response("Country/Region not found: "+route.groups["collection"], { status: 404 })
+    return new Response("Country/Region not found: " + collectionRaw, { status: 404 })
   }
 }
 
diff --git a/badges/deploy b/badges/deploy
index 65890aec1e..c0ffd32e65 100755
--- a/badges/deploy
+++ b/badges/deploy
@@ -6,12 +6,15 @@ import json, os, sys, subprocess, tempfile
 
 def main(baseurl):
   base_script = open('cloudflare_worker.js').read()
+  
   with tempfile.NamedTemporaryFile(mode='w+', suffix='.json') as i:
     subprocess.run(['curl', '-sf', '%s/rank_only.json' % baseurl.rstrip('/'), '-o', i.name], check=True)
     i.seek(0)
     data = json.loads(i.read())
-    user_data, org_data = {}, {}
+
+    user_data, org_data, titles = {}, {}, {}
     for location, hash in data.items():
+      titles[location] = hash.get('title')
       user_data[location] = hash.get('user', [])
       user_data[location+'_public'] = hash.get('user_public', [])
       user_data[location+'_private'] = hash.get('user_private', [])
@@ -24,7 +27,8 @@ def main(baseurl):
         print("uploading %s worker ..." % name)
         o.seek(0)
         o.truncate()
-        o.write(base_script+'\nconst BASE_URL = "%s"\nconst DATA = %s\n' % (baseurl, json.dumps(data)))
+        o.write(base_script+'\nconst BASE_URL = "%s"\nconst DATA = %s\nconst TITLES = %s\n' %
+                (baseurl, json.dumps(data), json.dumps(titles)))
         o.flush()
         status = subprocess.run(['curl', '-sX', 'PUT',
           'https://api.cloudflare.com/client/v4/accounts/%s/workers/scripts/%s' % (os.environ['CLOUDFLARE_ACCOUNT_ID'], name),
@@ -40,4 +44,4 @@ def main(baseurl):
           sys.exit(1)
 
 if __name__ == '__main__':
-  main(sys.argv[1])
+  main(sys.argv[1])
\ No newline at end of file
diff --git a/presets.go b/presets.go
index 2f5f309139..41a23084e9 100644
--- a/presets.go
+++ b/presets.go
@@ -15,143 +15,188 @@ type QueryPreset struct {
 
 var PRESETS = map[string]QueryPreset{
 	"panama": QueryPreset{
+		title:   "Panama",
 		include: []string{"panama", "panamá", "tocumen"},
 	},
 	"cyprus": QueryPreset{
+		title:   "Cyprus",
 		include: []string{"cyprus", "nicosia", "lefkosia", "limassol", "lemessos", "larnaka", "paphos"},
 	},
 	"austria": QueryPreset{
+		title:   "Austria",
 		include: []string{"austria", "österreich", "vienna", "wien", "linz", "salzburg", "graz", "innsbruck", "klagenfurt", "wels", "dornbirn"},
 	},
 	"armenia": QueryPreset{
+		title:   "Armenia",
 		include: []string{"armenia", "yerevan", "gyumri", "vanadzor", "vagharshapat", "abovyan", "kapan", "hrazdan", "armavir", "artashat", "ijevan", "gavar", "goris", "dilijan", "stepanakert", "martuni", "sisian", "alaverdi", "stepanavan", "berd"},
 	},
 	"oman": QueryPreset{
+		title:   "Oman",
 		include: []string{"oman", "ad+dakhiliyah", "ad+dhahirah", "batinah+north", "batinah+south", "al+buraymi", "al+wusta", "ash+sharqiyah+north", "ash+sharqiyah+south", "dhofar", "muscat", "musandam"},
 	},
 	"bahrain": QueryPreset{
+		title:   "Bahrain",
 		include: []string{"bahrain", "manama", "muharraq", "riffa", "hamad+town", "isa+town"},
 	},
 	"finland": QueryPreset{
+		title:   "Finland",
 		include: []string{"finland", "suomi", "helsinki", "tampere", "oulu", "espoo", "vantaa", "turku", "rovaniemi", "jyväskylä", "lahti", "kuopio", "pori", "lappeenranta", "vaasa"},
 	},
 	"sweden": QueryPreset{
+		title:   "Sweden",
 		include: []string{"sweden", "sverige", "stockholm", "malmö", "uppsala", "göteborg", "gothenburg"},
 	},
 	"suriname": QueryPreset{
+		title:   "Suriname",
 		include: []string{"suriname", "paramaribo"},
 	},
 	"norway": QueryPreset{
+		title:   "Norway",
 		include: []string{"norway", "norge", "oslo", "bergen", "trondheim", "stavanger", "drammen", "fredrikstad", "kristiansand", "tromsø", "sandnes", "ålesund", "bodø", "skien", "haugesund", "tønsberg", "arendal", "porsgrunn", "hamar", "larvik", "moss", "sandefjord", "halden", "harstad", "lillehammer", "molde", "gjøvik", "mo+i+rana", "steinkjer", "alta", "lommedalen"},
 	},
 	"germany": QueryPreset{
+		title:   "Germany",
 		include: []string{"germany", "deutschland", "berlin", "frankfurt", "munich", "münchen", "hamburg", "cologne", "köln"},
 	},
 	"netherlands": QueryPreset{
+		title:   "Netherlands",
 		include: []string{"netherlands", "nederland", "amsterdam", "rotterdam", "hague", "utrecht", "holland", "delft"},
 	},
 	"ukraine": QueryPreset{
+		title:   "Ukraine",
 		include: []string{"ukraine", "kiev", "kyiv", "kharkiv", "dnipro", "odesa", "donetsk", "zaporizhia"},
 	},
 	"japan": QueryPreset{
+		title:   "Japan",
 		include: []string{"japan", "tokyo", "yokohama", "osaka", "nagoya", "sapporo", "kobe", "kyoto", "fukuoka", "kawasaki", "saitama", "hiroshima", "sendai"},
 	},
 	"russia": QueryPreset{
+		title:   "Russia",
 		include: []string{"russia", "moscow", "saint+petersburg", "novosibirsk", "yekaterinburg", "nizhny+novgorod", "samara", "omsk", "kazan", "chelyabinsk", "rostov-on-don", "ufa", "volgograd"},
 	},
 	"estonia": QueryPreset{
+		title:   "Estonia",
 		include: []string{"estonia", "eesti", "tallinn", "tartu", "narva", "pärnu", "rakvere", "kohtla-järve", "viljandi", "maardu", "sillamäe"},
 	},
 	"denmark": QueryPreset{
+		title:   "Denmark",
 		include: []string{"denmark", "danmark", "copenhagen", "aarhus", "odense", "aalborg"},
 	},
 	"portugal": QueryPreset{
+		title:   "Portugal",
 		include: []string{"portugal", "lisbon", "lisboa", "braga", "porto", "aveiro", "coimbra", "funchal", "madeira"},
 	},
 	"france": QueryPreset{
+		title:   "France",
 		include: []string{"france", "paris", "marseille", "lyon", "toulouse", "nice", "nantes", "strasbourg", "montpellier", "bordeaux", "lille", "rennes", "reims", "rouen", "toulon", "le+havre", "grenoble", "dijon", "le+mans", "brest,france", "tours"},
 	},
 	"spain": QueryPreset{
+		title:   "Spain",
 		include: []string{"spain", "españa", "madrid", "barcelona", "valencia", "seville", "sevilla", "zaragoza", "malaga", "murcia", "palma", "bilbao", "alicante", "cordoba"},
 	},
 	"italy": QueryPreset{
+		title:   "Italy",
 		include: []string{"italy", "italia", "rome", "roma", "milan", "naples", "napoli", "turin", "torino", "palermo", "genoa", "genova", "bologna", "florence", "firenze", "bari", "catania", "venice", "verona"},
 	},
 	"uk": QueryPreset{
-		title:   "UK",
+		title:   "United Kingdom",
 		include: []string{"uk", "england", "scotland", "wales", "northern+ireland", "london", "birmingham", "leeds", "glasgow", "sheffield", "bradford", "manchester", "edinburgh", "liverpool", "bristol", "cardiff", "belfast", "leicester", "wakefield", "coventry", "nottingham", "newcastle"},
 	},
 	"croatia": QueryPreset{
+		title:   "Croatia",
 		include: []string{"croatia", "hrvatska", "zagreb", "split", "rijeka", "osijek", "zadar", "pula"},
 	},
 	"worldwide": QueryPreset{
+		title:   "Worldwide",
 		include: []string{},
 	},
 	"china": QueryPreset{
+		title:   "China",
 		include: []string{"china", "中国", "guangzhou", "shanghai", "beijing", "hangzhou"},
 	},
 	"india": QueryPreset{
-		include: []string{"india", "mumbai", "delhi", "bangalore", "hyderabad", "ahmedabad", "chennai", "kolkata", "jaipur"},
+		title:   "India",
+		include: []string{"india", "mumbai", "delhi", "bangalore", "hyderabad", "ahmedabad", "chennai", "kolkata", "jaipur", "pune", "gurgaon", "noida"},
 	},
 	"israel": QueryPreset{
+		title:   "Israel",
 		include: []string{"israel", "tel+aviv", "jerusalem", "beer+sheva", "beersheva", "netanya", "ramat+gan", "haifa", "herzliya", "rishon"},
 	},
 	"indonesia": QueryPreset{
+		title:   "Indonesia",
 		include: []string{"indonesia", "jakarta", "surabaya", "bandung", "medan", "bekasi", "semarang", "tangerang", "depok", "makassar", "palembang"},
 	},
 	"pakistan": QueryPreset{
+		title:   "Pakistan",
 		include: []string{"pakistan", "karachi", "lahore", "faisalabad", "rawalpindi", "peshawar", "islamabad"},
 	},
 	"brazil": QueryPreset{
+		title:   "Brazil",
 		include: []string{"brazil", "brasil", "são+paulo", "brasília", "salvador", "fortaleza", "belém", "belo+horizonte", "manaus", "curitiba", "recife", "rio+de+janeiro", "maceió", "aracaju", "porto+alegre", "florianópolis", "acre", "alagoas", "amapá", "amazonas", "bahia", "ceará", "distrito+federal", "espírito+santo", "goiás", "maranhão", "mato+grosso", "mato+grosso+do+sul", "minas+gerais", "pará", "paraíba", "paraná", "pernambuco", "piauí", "rio+grande+do+norte", "rio+grande+do+sul", "rondônia", "roraima", "santa+catarina", "sergipe", "tocantins"},
 	},
 	"nigeria": QueryPreset{
+		title:   "Nigeria",
 		include: []string{"nigeria", "lagos", "kano", "ibadan", "benin+city", "port+harcourt", "jos", "ilorin", "kaduna"},
 	},
 	"bangladesh": QueryPreset{
+		title:   "Bangladesh",
 		include: []string{"bangladesh", "dhaka", "chittagong", "khulna", "rajshahi", "barisal", "sylhet", "rangpur", "comilla", "gazipur"},
 	},
 	"mexico": QueryPreset{
+		title:   "Mexico",
 		include: []string{"mexico", "mexico+city", "guadalajara", "puebla", "tijuana", "mexicali", "monterrey", "hermosillo", "zapopan", "ciudad+juarez", "chihuahua", "aguascalientes", "mx"},
 	},
 	"philippines": QueryPreset{
+		title:   "Philippines",
 		include: []string{"philippines", "pilipinas", "quezon", "manila", "davao", "caloocan", "cebu", "zamboanga", "bohol", "pasig", "bacolod", "makati", "baguio", "cavite"},
 	},
 	"luxembourg": QueryPreset{
+		title:   "Luxembourg",
 		include: []string{"luxembourg", "esch-sur-alzette", "differdange", "dudelange", "ettelbruck", "diekirch", "wiltz", "echternach", "rumelange", "grevenmacher", "bertrange", "mamer", "capellen", "strassen", "diekirch"},
 	},
 	"egypt": QueryPreset{
-		include: []string{"egypt", "cairo", "alexandria", "giza", "port+said", "suez", "luxor", "el+mahalla", "asyut", "al+mansurah", "tanda"},
+		title:   "Egypt",
+		include: []string{"egypt", "cairo", "alexandria", "giza", "port+said", "suez", "luxor", "el+mahalla", "asyut", "asiut", "al+mansurah", "mansoura", "tanta", "ismailia", "hurghada", "sharm+el-sheikh", "nuweiba", "dahab", "ain+shams", "ain+el+sokhna", "ain+elsokhna", "gouna", "el+gouna", "zagazig", "fayoum", "faiyum", "aswan", "minya", "sohag", "beni+suef", "damietta", "kafr+el-sheikh", "banha", "damanhur", "shibin+el+kom", "qena", "arish", "marsa+matrouh", "kharga", "monufia", "sharkia", "sharqia", "dakahlia", "gharbia", "qalyubia", "beheira", "matrouh", "north+sinai", "south+sinai", "red+sea", "new+valley", "10th+of+ramadan", "6th+of+october", "obour+city", "new+cairo", "sadat+city", "borg+el+arab", "om+el+donia", "masr", "heliopolis", "nasr+city"},
 		exclude: []string{",+VA", "Virginia", ",+LA", "Louisiana"},
 	},
 	"ethiopia": QueryPreset{
+		title:   "Ethiopia",
 		include: []string{"ethiopia", "addis+ababa", "gondar", "adama", "hawassa", "bahir+dar"},
 	},
 	"vietnam": QueryPreset{
+		title:   "Vietnam",
 		include: []string{"vietnam", "viet+nam", "ho+chi+minh", "hanoi", "ha+noi", "hai+phong", "da+nang", "can+tho", "bien+hoa", "nha+trang", "vinh"},
 	},
 	"iran": QueryPreset{
+		title:   "Iran",
 		include: []string{"iran", "tehran", "mashhad", "isfahan", "esfahan", "karaj", "shiraz", "tabriz", "qom", "ahvaz", "ahwaz", "kermanshah", "urmia", "rasht", "kerman"},
 	},
 	"congo kinshasa": QueryPreset{
+		title:   "Democratic Republic of the Congo",
 		include: []string{"congo+kinshasa", "drc", "cod", "kinshasa", "lubumbashi", "bukavu", "kananga", "goma", "mbuji+mayi", "likasi", "kolwezi", "kalemie", "uvira", "matadi", "moba", "kamina", "kabalo", "fungurume"},
 	},
 	"congo brazzaville": QueryPreset{
+		title:   "Republic of the Congo",
 		include: []string{"congo+brazza", "cog", "brazzaville", "djambala", "pointe+noire", "sibiti", "owando", "madingou", "loango", "kinkala", "impfondo", "dolisie"},
 	},
 	"turkey": QueryPreset{
+		title:   "Turkey",
 		include: []string{"turkey", "turkiye", "istanbul", "ankara", "izmir", "bursa", "adana", "gaziantep", "konya", "antalya", "kayseri", "mersin", "eskisehir", "samsun", "denizli", "malatya"},
 	},
 	"thailand": QueryPreset{
+		title:   "Thailand",
 		include: []string{"thailand", "bangkok", "nonthaburi", "nakhon", "phuket", "pattaya", "chiang+mai"},
 	},
 	"south africa": QueryPreset{
-		include: []string{"south+africa", "south+africa", "johannesburg", "cape+town", "rsa", "durban", "port+elizabeth", "pretoria", "nelspruit"},
+		title:   "South Africa",
+		include: []string{"south+africa", "south+africa", "johannesburg", "cape+town", "rsa", "durban", "port+elizabeth", "pretoria", "nelspruit", "knysna"},
 	},
 	"myanmar": QueryPreset{
+		title:   "Myanmar",
 		include: []string{"myanmar", "burma", "yangon", "rangoon", "mandalay", "nay+pyi+taw", "taunggyi", "bago", "mawlamyine"},
 	},
 	"tanzania": QueryPreset{
+		title:   "Tanzania",
 		include: []string{"tanzania", "dar+es+salaam", "mwanza", "arusha", "dodoma", "mbeya", "morogoro", "tanga", "kilimanjaro"},
 	},
 	"south korea": QueryPreset{
@@ -159,304 +204,422 @@ var PRESETS = map[string]QueryPreset{
 		include: []string{"south+korea", "ROK", "korea", "seoul", "busan", "incheon", "daegu", "daejeon", "gwangju", "대한민국", "서울", "서울시"},
 	},
 	"colombia": QueryPreset{
+		title:   "Colombia",
 		include: []string{"colombia", "bogota", "medellin", "cali", "barranquilla", "cartagena", "cucuta", "bucaramanga", "ibague", "soledad", "pereira", "santa+marta"},
 	},
 	"kenya": QueryPreset{
+		title:   "Kenya",
 		include: []string{"kenya", "nairobi", "mombasa", "kisumu", "nakuru", "eldoret", "kisii", "nyeri", "machakos", "Embu"},
 	},
 	"argentina": QueryPreset{
+		title:   "Argentina",
 		include: []string{"argentina", "buenos+aires", "cordoba", "rosario", "mendoza", "la+plata", "tucuman", "mar+del+plata", "salta", "resistencia"},
 	},
 	"algeria": QueryPreset{
+		title:   "Algeria",
 		include: []string{"algeria", "algiers", "oran", "constantine", "annaba", "blida", "batna", "djelfa", "setif", "sidi+bel+abbes", "biskra", "tiaret", "relizane", "mostaganem", "tlemcen", "chlef", "jijel"},
 	},
 	"sudan": QueryPreset{
+		title:   "Sudan",
 		include: []string{"sudan", "khartoum", "omdurman"},
 	},
 	"poland": QueryPreset{
+		title:   "Poland",
 		include: []string{"poland", "polska", "warsaw", "krakow", "lodz", "wroclaw", "poznan", "gdansk", "szczecin", "bydgoszcz", "lublin", "katowice", "bialystok"},
 	},
 	"canada": QueryPreset{
+		title:   "Canada",
 		include: []string{"canada", "ottawa", "edmonton", "winnipeg", "vancouver", "toronto", "quebec", "montreal", "mississauga", "calgary"},
 	},
 	"australia": QueryPreset{
+		title:   "Australia",
 		include: []string{"australia", "sydney", "melbourne", "brisbane", "perth", "adelaide", "canberra", "hobart"},
 	},
 	"new zealand": QueryPreset{
+		title:   "New Zealand",
 		include: []string{"new+zealand", "auckland", "wellington", "christchurch", "hamilton", "tauranga", "napier-hastings", "dunedin", "palmerston+north", "nelson", "rotorua", "whangarei", "new+plymouth", "invercargill", "whanganui", "gisborne"},
 	},
 	"belgium": QueryPreset{
+		title:   "Belgium",
 		include: []string{"belgium", "antwerp", "ghent", "charleroi", "liege", "brussels", "belgique"},
 	},
 	"greece": QueryPreset{
+		title:   "Greece",
 		include: []string{"greece", "Ελλάδα", "athens", "thessaloniki", "patras", "heraklion", "larissa", "volos", "rhodes", "ioannina", "chania", "crete"},
 		exclude: []string{"GA"},
 	},
 	"peru": QueryPreset{
+		title:   "Peru",
 		include: []string{"peru", "lima", "cusco", "cuzco", "ica", "arequipa", "trujillo", "chiclayo", "huancayo", "piura", "chimbote", "iquitos", "juliaca", "cajamarca"},
 	},
 	"hungary": QueryPreset{
+		title:   "Hungary",
 		include: []string{"hungary", "magyarország", "budapest", "szeged", "miskolc"},
 	},
 	"albania": QueryPreset{
+		title:   "Albania",
 		include: []string{"albania", "tirana", "durres", "vlore", "elbasan", "shkoder"},
 	},
 	"uganda": QueryPreset{
+		title:   "Uganda",
 		include: []string{"uganda", "kampala", "mbarara", "mukono", "jinja", "arua", "gulu", "masaka"},
 	},
 	"zambia": QueryPreset{
+		title:   "Zambia",
 		include: []string{"zambia", "lusaka", "kitwe", "ndola"},
 	},
 	"sri lanka": QueryPreset{
+		title:   "Sri Lanka",
 		include: []string{"sri+lanka", "balangoda", "ratnapura", "colombo", "moratuwa", "negombo", "galle", "jaffna"},
 	},
 	"singapore": QueryPreset{
+		title:   "Singapore",
 		include: []string{"singapore"},
 	},
 	"latvia": QueryPreset{
+		title:   "Latvia",
 		include: []string{"latvia", "latvija", "riga", "rīga", "kuldiga", "kuldīga", "ventspils", "liepaja", "liepāja", "daugavpils", "jelgava", "jurmala", "jūrmala"},
 	},
 	"romania": QueryPreset{
+		title:   "Romania",
 		include: []string{"romania", "bucharest", "cluj", "iasi", "timisoara", "craiova", "brasov", "sibiu", "constanta", "oradea", "galati", "ploesti", "pitesti", "arad", "bacau"},
 	},
 	"moldova": QueryPreset{
+		title:   "Moldova",
 		include: []string{"moldova", "chisinau", "tiraspol", "balti", "bender", "ribnita", "cahul", "ungheni", "soroca", "orhei", "dubasari"},
 	},
 	"belarus": QueryPreset{
+		title:   "Belarus",
 		include: []string{"belarus", "minsk", "brest,belarus", "grodno", "gomel", "vitebsk", "mogilev", "slutsk", "borisov", "pinsk", "baranovichi", "bobruisk", "soligorsk"},
 	},
 	"malta": QueryPreset{
+		title:   "Malta",
 		include: []string{"malta", "birgu", "bormla", "mdina", "qormi", "senglea", "siġġiewi", "valletta", "zabbar", "zebbuġ", "zejtun"},
 	},
 	"rwanda": QueryPreset{
+		title:   "Rwanda",
 		include: []string{"rwanda", "kigali", "butare", "muhanga", "ruhengeri", "gisenyi", "nyarugenge", "huye", "musanze", "rubavu", "rwamagana", "kirehe", "kibungo", "ngoma", "nyagatare", "gicumbi", "nyabihu", "kibuye", "karongi", "rusizi", "nyamasheke", "ruhango", "nyanza", "kamonyi", "kicukiro", "gasabo"},
 	},
 	"saudi arabia": QueryPreset{
+		title:   "Saudi Arabia",
 		include: []string{"Saudi", "KSA", "Riyadh", "Mecca", "Jeddah", "Dammam"},
 	},
 	"morocco": QueryPreset{
+		title:   "Morocco",
 		include: []string{"morocco", "casablanca", "fez", "tangier", "marrakesh", "salé", "meknes", "rabat", "oujda", "kenitra", "agadir", "tetouan", "temara", "safi", "mohammedia", "khouribga", "el+jadida"},
 	},
 	"uzbekistan": QueryPreset{
+		title:   "Uzbekistan",
 		include: []string{"uzbekistan", "tashkent", "namangan", "samarkand", "andijan", "nukus", "bukhara", "qarshi", "fergana"},
 	},
 	"malaysia": QueryPreset{
+		title:   "Malaysia",
 		include: []string{"malaysia", "kuala+lumpur", "kajang", "klang", "subang", "penang", "ipoh", "selangor", "melaka", "johor", "sabah", "johor+bahru", "shah+alam", "iskandar+puteri"},
 	},
 	"afghanistan": QueryPreset{
+		title:   "Afghanistan",
 		include: []string{"afghanistan", "kabul", "kandahar", "herat", "mazar-e-sharif", "jalalabad", "ghazni", "nangarhar", "khost", "zabul", "helmand", "parwan", "farah", "kunar", "wardak", "baghlan", "kunduz", "takhar", "paktia", "paktika"},
 	},
 	"venezuela": QueryPreset{
+		title:   "Venezuela",
 		include: []string{"venezuela", "caracas", "maracaibo", "barquisimeto", "guayana", "maturín", "zulia", "bolivar"},
 	},
 	"ghana": QueryPreset{
+		title:   "Ghana",
 		include: []string{"ghana", "accra", "kumasi", "sekondi", "ashaiman", "sunyani", "tamale", "tema"},
 	},
 	"angola": QueryPreset{
+		title:   "Angola",
 		include: []string{"angola", "luanda", "huambo", "lobito", "benguela"},
 	},
 	"nepal": QueryPreset{
+		title:   "Nepal",
 		include: []string{"nepal", "kathmandu", "pokhara", "lalitpur", "bharatpur", "birgunj", "biratnagar", "janakpur", "ghorahi"},
 	},
 	"yemen": QueryPreset{
+		title:   "Yemen",
 		include: []string{"yemen", "sana'a", "taiz", "aden", "mukalla", "ibb"},
 	},
 	"mozambique": QueryPreset{
+		title:   "Mozambique",
 		include: []string{"mozambique", "maputo", "matola", "nampula", "beira", "sofala", "chimoio", "tete", "quelimane"},
 	},
 	"ivory coast": QueryPreset{
+		title:   "Ivory Coast",
 		include: []string{"ivory", "abidjan", "bouaké", "daloa", "yamoussoukro"},
 	},
 	"cameroon": QueryPreset{
+		title:   "Cameroon",
 		include: []string{"cameroon", "Douala", "Yaoundé", "Bafoussam", "Bamenda", "Garoua", "Maroua", "Ngaoundéré", "Kumba", "Nkongsamba", "Buea"},
 	},
 	"taiwan": QueryPreset{
+		title:   "Taiwan",
 		include: []string{"taiwan", "Taichung", "Kaohsiung", "Taipei", "Taoyuan", "Tainan", "Hsinchu", "Keelung", "Chiayi", "Changhua"},
 	},
 	"niger": QueryPreset{
+		title:   "Niger",
 		include: []string{"niger", "Niamey", "Maradi", "Zinder", "Tahoua", "Agadez", "Arlit", "Birni-N'Konni", "Dosso", "Gaya", "Tessaoua"},
 	},
 	"burkina faso": QueryPreset{
+		title:   "Burkina Faso",
 		include: []string{"burkina+faso", "Ouagadougou", "Bobo-Dioulasso", "Koudougou", "Banfora", "Ouahigouya", "Pouytenga", "Kaya", "Tenkodogo", "Fada+N'gourma", "Houndé"},
 	},
 	"mali": QueryPreset{
+		title:   "Mali",
 		include: []string{"mali", "bamako", "sikasso", "kalabancoro", "koutiala", "ségou", "kayes", "kati", "mopti", "niono"},
 	},
 	"malawi": QueryPreset{
+		title:   "Malawi",
 		include: []string{"malawi", "Lilongwe", "Blantyre", "Mzuzu", "Zomba", "Karonga", "Kasungu", "Mangochi", "Salima", "Liwonde", "Balaka"},
 	},
 	"chile": QueryPreset{
+		title:   "Chile",
 		include: []string{"chile", "Santiago", "Valparaíso", "Concepción", "La+Serena", "Antofagasta", "Temuco", "Rancagua", "Talca", "Arica", "Chillán"},
 	},
 	"kazakhstan": QueryPreset{
+		title:   "Kazakhstan",
 		include: []string{"kazakhstan", "Almaty", "Shymkent", "Karagandy", "Taraz", "Nur-Sultan", "Pavlodar", "Oskemen", "Semey"},
 	},
 	"guatemala": QueryPreset{
+		title:   "Guatemala",
 		include: []string{"Guatemala", "mixco", "villa+nueva", "petapa", "Quetzaltenango"},
 	},
 	"ecuador": QueryPreset{
+		title:   "Ecuador",
 		include: []string{"ecuador", "Guayaquil", "Quito", "Cuenca", "Machala"},
 	},
 	"syria": QueryPreset{
+		title:   "Syria",
 		include: []string{"syria", "سوريا", "damascus", "hama", "aleppo", "homs", "rif+dimashq", "tartus", "latakia", "idlib", "raqqa", "daraa", "alhasakah", "dierezzor", "quneitra", "alsuwayda"},
 	},
 	"cambodia": QueryPreset{
+		title:   "Cambodia",
 		include: []string{"cambodia", "phnom", "battambang", "siem+reap", "kampong"},
 	},
 	"senegal": QueryPreset{
+		title:   "Senegal",
 		include: []string{"senegal", "dakar", "touba", "thies", "rufisque", "kaolack", "ziguinchor", "tambacounda", "kaffrine", "diourbel"},
 	},
 	"chad": QueryPreset{
+		title:   "Chad",
 		include: []string{"chad", "tchad", "n'djamena", "moundou"},
 	},
 	"somalia": QueryPreset{
+		title:   "Somalia",
 		include: []string{"somalia", "mogadishu", "hargeisa", "bosaso", "borama", "garowe", "kismayo"},
 	},
 	"zimbabwe": QueryPreset{
+		title:   "Zimbabwe",
 		include: []string{"zimbabwe", "harare", "bulawayo", "mutare", "gweru", "kwekwe"},
 	},
 	"guinea": QueryPreset{
+		title:   "Guinea",
 		include: []string{"conakry"},
 	},
 	"benin": QueryPreset{
+		title:   "Benin",
 		include: []string{"benin", "cotonou", "porto-novo", "abomey"},
 	},
 	"haiti": QueryPreset{
+		title:   "Haiti",
 		include: []string{"haiti", "port-au-prince", "cap-haitien", "carrefour", "delmas", "petion-ville"},
 	},
 	"cuba": QueryPreset{
+		title:   "Cuba",
 		include: []string{"cuba", "havana", "santiago+de+cuba", "camaguey", "holguin", "guantanamo", "bayamo"},
 	},
 	"bolivia": QueryPreset{
+		title:   "Bolivia",
 		include: []string{"bolivia", "santa+cruz+de+la+sierra", "el+alto", "la+paz", "cochabamba", "oruro", "sucre"},
 	},
 	"tunisia": QueryPreset{
+		title:   "Tunisia",
 		include: []string{"tunisia", "tunis", "sfax", "sousse", "kairouan", "ariana", "gabes", "bizerte"},
 	},
 	"south sudan": QueryPreset{
-		include: []string{"south sudan", "juba"},
+		title:   "South Sudan",
+		include: []string{"south sudan", "juba", "yei", "wau", "aweil", "jonglei", "maridi"},
 	},
 	"burundi": QueryPreset{
+		title:   "Burundi",
 		include: []string{"burundi", "bujumbura", "gitega"},
 	},
 	"dominican republic": QueryPreset{
+		title:   "Dominican Republic",
 		include: []string{"dominican+republic", "republica+dominicana", "santo+domingo", "la+vega", "macoris"},
 	},
 	"czech republic": QueryPreset{
+		title:   "Czech Republic",
 		include: []string{"czech", "czechia", "ceska", "prague", "budejovice", "plzen", "karlovy", "ostrava", "brno"},
 	},
 	"jordan": QueryPreset{
+		title:   "Jordan",
 		include: []string{"jordan", "amman", "zarqa", "irbid"},
 	},
 	"azerbaijan": QueryPreset{
+		title:   "Azerbaijan",
 		include: []string{"azerbaijan", "baku", "sumqayit", "ganja", "lankaran"},
 	},
 	"uae": QueryPreset{
-		title:   "UAE",
+		title:   "United Arab Emirates",
 		include: []string{"uae", "emirates", "dubai", "abu+dhabi", "sharjah", "al+ain", "ajman"},
 	},
 	"honduras": QueryPreset{
+		title:   "Honduras",
 		include: []string{"honduras", "tegucigalpa", "san+pedro+sula", "choloma", "la+ceiba", "el+progreso", "choluteca", "comayagua"},
 	},
 	"tajikistan": QueryPreset{
-		include: []string{"tajikistan", "dushanbe", "khujand"},
+		title:   "Tajikistan",
+		include: []string{"tajikistan", "dushanbe", "khujand", "kulob", "bokhtar", "khorugh", "panjakent", "isfara", "hisor", "ghissar", "rasht"},
 	},
 	"papua new guinea": QueryPreset{
+		title:   "Papua New Guinea",
 		include: []string{"papua+new+guinea", "port+moresby", "lae"},
 	},
 	"serbia": QueryPreset{
+		title:   "Serbia",
 		include: []string{"serbia", "belgrade", "novi+sad", "nis", "kragujevac", "subotica", "zrenjanin", "pancevo", "cacak", "novi+pazar", "kraljevo", "smederevo"},
 	},
 	"switzerland": QueryPreset{
+		title:   "Switzerland",
 		include: []string{"switzerland", "zurich", "zürich", "geneva", "basel", "lausanne", "bern", "winterthur", "lucerne", "gallen", "lugano", "biel", "thun"},
 	},
 	"togo": QueryPreset{
+		title:   "Togo",
 		include: []string{"togo", "lome"},
 	},
 	"sierra leone": QueryPreset{
+		title:   "Sierra Leone",
 		include: []string{"sierra+leone", "freetown", "makeni", "koidu"},
 	},
 	"ireland": QueryPreset{
+		title:   "Ireland",
 		include: []string{"ireland", "dublin", "cork", "limerick", "galway", "waterford+ireland", "drogheda", "dundalk"},
 	},
 	"hong kong": QueryPreset{
+		title:   "Hong Kong",
 		include: []string{"hong+kong", "香港", "kowloon", "九龍"},
 	},
 	"macau": QueryPreset{
+		title:   "Macau",
 		include: []string{"macau", "macao"},
 	},
 	"el salvador": QueryPreset{
+		title:   "El Salvador",
 		include: []string{"el+salvador"},
 	},
 	"kyrgyzstan": QueryPreset{
+		title:   "Kyrgyzstan",
 		include: []string{"kyrgyzstan", "bishkek", "osh", "jalal-abad", "karakol", "tokmok"},
 	},
 	"nicaragua": QueryPreset{
+		title:   "Nicaragua",
 		include: []string{"nicaragua", "managua", "matagalpa", "chinandega"},
 	},
 	"turkmenistan": QueryPreset{
+		title:   "Turkmenistan",
 		include: []string{"turkmenistan", "turkmenabat"},
 	},
 	"paraguay": QueryPreset{
+		title:   "Paraguay",
 		include: []string{"paraguay", "asunción", "asuncion", "ciudad+del+este", "san+lorenzo", "luque", "capiata"},
 	},
 	"laos": QueryPreset{
+		title:   "Laos",
 		include: []string{"laos", "vientiane", "pakse"},
 	},
 	"bulgaria": QueryPreset{
+		title:   "Bulgaria",
 		include: []string{"bulgaria", "sofia", "plovdiv", "varna", "burgas", "ruse", "stara+zagora", "pleven"},
 	},
 	"lebanon": QueryPreset{
-		include: []string{"lebanon", "beirut", "sidon", "tyre"},
+		title:   "Lebanon",
+		include: []string{"lebanon", "beirut", "sidon", "tyre", "tripoli", "byblos", "bekaa", "jounieh", "zahle", "baalbek", "nabatieh", "jbeil", "batroun", "achrafieh", "hamra"},
 	},
 	"libya": QueryPreset{
+		title:   "Libya",
 		include: []string{"libya", "tripoli", "benghazi", "misrata", "zliten", "bayda"},
 		exclude: []string{"lebanon", "greece", "gr"},
 	},
 	"slovakia": QueryPreset{
+		title:   "Slovakia",
 		include: []string{"slovakia", "bratislava", "kosice", "presov", "zilina"},
 	},
 	"slovenia": QueryPreset{
+		title:   "Slovenia",
 		include: []string{"slovenia", "slovenija", "ljubljana", "maribor", "celje", "kranj", "koper", "velenje", "novo+mesto", "nova+gorica", "krsko", "krško", "murska+sobota", "postojna", "slovenj+gradec"},
 	},
 	"lithuania": QueryPreset{
+		title:   "Lithuania",
 		include: []string{"lithuania", "vilnius", "kaunas", "klaipeda", "siauliai", "panevezys", "alytus"},
 	},
 	"uruguay": QueryPreset{
+		title:   "Uruguay",
 		include: []string{"uruguay", "montevideo"},
 	},
 	"united states": QueryPreset{
+		title:   "United States",
 		include: []string{",+US", "USA", "United+States", "Alabama", ",+AL", "Alaska", ",+AK", "Arizona", ",+AZ", "Arkansas", ",+AR", "California", ",+CA", "Colorado", ",+CO", "Connecticut", ",+CT", "Delaware", ",+DE", "Florida", ",+FL", "Georgia", ",+GA", "Hawaii", ",+HI", "Idaho", ",+ID", "Illinois", ",+IL", "Indiana", ",+IN", "Iowa", ",+IA", "Kansas", ",+KS", "Kentucky", ",+KY", "Louisiana", ",+LA", "Maine", ",+ME", "Maryland", ",+MD", "Massachusetts", ",+MA", "Michigan", ",+MI", "Minnesota", ",+MN", "Mississippi", ",+MS", "Missouri", ",+MO", "Montana", ",+MT", "Nebraska", ",+NE", "Nevada", ",+NV", "New+Hampshire", ",+NH", "New+Jersey", ",+NJ", "New+Mexico", ",+NM", "New+York", ",+NY", "North+Carolina", ",+NC", "North+Dakota", ",+ND", "Ohio", ",+OH", "Oklahoma", ",+OK", "Oregon", ",+OR", "Pennsylvania", ",+PA", "Rhode+Island", ",+RI", "South+Carolina", ",+SC", "South+Dakota", ",+SD", "Tennessee", ",+TN", "Texas", ",+TX", "Utah", ",+UT", "Vermont", ",+VT", "Virginia", ",+VA", "Washington", ",+WA", "West+Virginia", ",+WV", "Wisconsin", ",+WI", "Wyoming", ",+WY", "Los+Angeles", "Chicago", "Houston", "Phoenix", "Philadelphia", "San+Antonio", "San+Diego", "Dallas", "San+Jose", "Austin", "Jacksonville", "Fort+Worth", "Columbus", "Charlotte", "San+Francisco", "Indianapolis", "Seattle", "Denver", "Boston", "El+Paso", "Nashville", "Detroit", "Portland", "Las+Vegas", "Memphis", "Louisville", "Baltimore"},
 	},
 	"macedonia": QueryPreset{
+		title:   "North Macedonia",
 		include: []string{"macedonia", "fyrom", "north+macedonia", "mk", "mkd", "ohd", "skp", "skopje", "bitola", "kumanovo", "prilep", "tetovo", "veles", "shtip", "ohrid", "gostivar", "strumica", "kavadarci", "negotino", "berovo", "kratovo", "struga", "valandovo", "demir+kapija", "demir+hisar", "krusheve", "gevgelija"},
 	},
 	"palestine": QueryPreset{
+		title:   "Palestine",
 		include: []string{"palestine", "jerusalem", "gaza", "hebron", "jenin", "nablus", "ramallah", "rafah"},
 	},
 	"mauritania": QueryPreset{
+		title:   "Mauritania",
 		include: []string{"mauritania", "mauritanie", "nouakchott", "nouadhibou"},
 	},
 	"botswana": QueryPreset{
+		title:   "Botswana",
 		include: []string{"botswana", "gaborone", "francistown"},
 	},
 	"iraq": QueryPreset{
-		include: []string{"baghdad", "mosul", "basra", "kirkuk", "erbil", "najaf", "karbala", "sulaymaniya", "al-nasiriya", "al-amarah"},
+		title:   "Iraq",
+		include: []string{"baghdad", "mosul", "basra", "najaf", "karbala", "al-nasiriya", "al-amarah"},
 	},
 	"qatar": QueryPreset{
+		title:   "Qatar",
 		include: []string{"Qatar", "Doha"},
 	},
 	"the bahamas": QueryPreset{
+		title:   "The Bahamas",
 		include: []string{"Bahamas"},
 	},
 	"gabon": QueryPreset{
+		title:   "Gabon",
 		include: []string{"gabon", "Libreville", "Port-gentil", "Franceville", "Oyem", "Moanda"},
 	},
 	"georgia": QueryPreset{
+		title:   "Georgia",
 		include: []string{"Tbilisi", "Batumi", "Kutaisi", "Rustavi", "Zugdidi", "Gori", "Poti", "Telavi", "Akhaltsikhe", "Mtskheta", "Ozurgeti", "Sukhumi", "Samtredia", "Marneuli"},
 	},
 	"kosovo": QueryPreset{
-		include: []string{"kosovo", "kosove", "prishtine"},
+		title:   "Kosovo",
+		include: []string{"kosovo", "kosove", "prishtine", "prizren", "peja", "gjakova", "ferizaj", "gjilan", "mitrovica", "podujev", "vushtrri", "suhareke", "rahovec", "lipjan", "skenderaj", "kamenice", "malisheve", "decan", "istog", "kline", "fushe+kosove"},
+	},
+	"madagascar": QueryPreset{
+		title:   "Madagascar",
+		include: []string{"madagascar", "antananarivo", "toamasina", "antsiranana", "mahajanga", "fianarantsoa", "toliara", "antsirabe", "ambositra", "ambatondrazaka", "manakara", "sambava", "morondava", "ambanja", "farafangana", "maintirano", "antsalova", "isoa", "mampikony", "ambatolampy", "ambatofinandrahana", "mandritsara", "marovoay", "moramanga", "vangaindrano", "soaindrana", "ikongo", "tamatave", "diego+suarez", "mananjary", "vohemar", "amparafaravola"},
+	},
+	"mauritius": QueryPreset{
+		title:   "Mauritius",
+		include: []string{"mauritius", "port+louis", "curepipe", "quatre+bornes", "vacoas-phoenix", "vacoas", "beau-bassin-rose-hill", "beau+bassin", "rose+hill", "mahebourg", "goodlands", "triolet", "bel+air", "flacq", "souillac", "pamplemousses", "grand+baie", "ebene"},
+	},
+	"bosnia and herzegovina": QueryPreset{
+		title:   "Bosnia and Herzegovina",
+		include: []string{"sarajevo", "banja+luka", "tuzla", "zenica", "bijeljina", "mostar", "prijedor", "brcko", "doboj", "cazin"},
+	},
+	"kurdistan": QueryPreset{
+		title:   "Kurdistan",
+		include: []string{"kurdistan", "erbil", "hawler", "sulaymaniyah", "slemani", "duhok", "halabja", "kirkuk"},
+	},
+	"costa rica": QueryPreset{
+		title:   "Costa Rica",
+		include: []string{"costa+rica", "san+josé", "alajuela", "cartago", "heredia", "guanacaste", "puntarenas", "limón"},
 	},
 }