diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 18c19f2..1a401ea 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -29,10 +29,11 @@ jobs:
         with:
           node-version: 22
           cache: npm
+      # First, so a repository without Pages fails in seconds, not after the whole fetch.
+      - uses: actions/configure-pages@v5
       - run: npm ci
       - run: npm run fetch
       - run: npm run build
-      - uses: actions/configure-pages@v5
       - uses: actions/upload-pages-artifact@v3
         with:
           path: public
diff --git a/src/wikidata.ts b/src/wikidata.ts
index e5f8287..ea086bd 100644
--- a/src/wikidata.ts
+++ b/src/wikidata.ts
@@ -77,6 +77,27 @@ export const COUNTRIES_QUERY = `SELECT DISTINCT ?iso2 WHERE {
   FILTER NOT EXISTS { ?country wdt:P576 ?dissolved . }
 }`;
 
+/**
+ * Where the ISO code sits on an item other than the one towns and stations name as their
+ * country: "NL" is on the Kingdom of the Netherlands, while Dutch towns and stations are in
+ * the Netherlands, its European part.
+ */
+const COUNTRY_ITEMS: Record<string, string> = { NL: "Q55" };
+
+/** Binds ?country to the country with this ISO 3166-1 code. */
+function country(countryIso2: string): string {
+  const item = COUNTRY_ITEMS[countryIso2];
+  return item ? `BIND(wd:${item} AS ?country)` : `?country wdt:P297 "${countryIso2}" .`;
+}
+
+/**
+ * What a town is: a human settlement, or a municipality (French communes, Italian comuni and
+ * Dutch gemeenten are municipalities, not settlements, on Wikidata). Neighbourhoods are left
+ * out: Turkey alone has thousands of mahalle of 5,000 people or more.
+ */
+const TOWN_CLASSES = `FILTER(?cls NOT IN (wd:Q17051044, wd:Q123705, wd:Q2983893))
+    { ?cls wdt:P279* wd:Q486972 . } UNION { ?cls wdt:P279* wd:Q15284 . }`;
+
 export function parseCountries(result: unknown): string[] {
   const codes = bindings(result)
     .map((b) => b.iso2?.value?.toUpperCase() ?? "")
@@ -96,15 +117,15 @@ export function citiesQuery(countryIso2: string, byPopulation = false): string {
   // read every item of the country. Slower for small countries, but never times out.
   const towns = byPopulation
     ? `hint:SubQuery hint:optimizer "None" .
-    ?country wdt:P297 "${countryIso2}" .
+    ${country(countryIso2)}
     ?city wdt:P1082 ?p0 .
     FILTER(?p0 >= ${minPopulation(countryIso2)})
     ?city wdt:P17 ?country ; wdt:P31 ?cls .
-    ?cls wdt:P279* wd:Q486972 .`
-    : `?country wdt:P297 "${countryIso2}" .
+    ${TOWN_CLASSES}`
+    : `${country(countryIso2)}
     ?city wdt:P17 ?country ; wdt:P1082 ?p0 ; wdt:P31 ?cls .
     FILTER(?p0 >= ${minPopulation(countryIso2)})
-    ?cls wdt:P279* wd:Q486972 .`;
+    ${TOWN_CLASSES}`;
   return `SELECT ?city ?cityLabel (MAX(?p) AS ?pop) (SAMPLE(?c) AS ?coord) (SAMPLE(?v) AS ?voy) (SAMPLE(?w) AS ?wp) (SAMPLE(?s) AS ?site)
        (GROUP_CONCAT(DISTINCT ?alt; separator="|") AS ?names)
 WITH {
@@ -286,7 +307,7 @@ export function stationsQuery(countryIso2: string): string {
 WITH {
   SELECT ?station (SAMPLE(?c) AS ?coord) WHERE {
     hint:SubQuery hint:optimizer "None" .
-    ?country wdt:P297 "${countryIso2}" .
+    ${country(countryIso2)}
     ?station wdt:P31 wd:Q55488 .
     ?station wdt:P17 ?country ; wdt:P625 ?c ; wikibase:sitelinks ?links .
     FILTER NOT EXISTS { ?station wdt:P576 ?closed . }
diff --git a/tests/places.test.ts b/tests/places.test.ts
index 9a71cbf..8023b31 100644
--- a/tests/places.test.ts
+++ b/tests/places.test.ts
@@ -2,7 +2,7 @@ import { readFileSync } from "node:fs";
 import { describe, expect, it } from "vitest";
 import { PACK_MAX, buildFiles, placeIds, slug, type Place, type PlacesIndex } from "../src/places";
 import type { Catalog } from "../src/catalog";
-import { citiesQuery, minPopulation, parseCities, parseCountries, parseSights, parseStations, point, sightsQuery, type Raw } from "../src/wikidata";
+import { citiesQuery, minPopulation, parseCities, parseCountries, parseSights, parseStations, point, sightsQuery, stationsQuery, type Raw } from "../src/wikidata";
 
 const fixture = (name: string): unknown => JSON.parse(readFileSync(new URL(`./fixtures/${name}`, import.meta.url), "utf-8"));
 
@@ -55,8 +55,17 @@ describe("Wikidata results", () => {
 
   it("builds queries for a country and a batch of cities", () => {
     expect(citiesQuery("FR")).toContain('wdt:P297 "FR"');
+    // Communes are municipalities on Wikidata, not settlements.
+    expect(citiesQuery("FR")).toContain("wd:Q15284");
     expect(sightsQuery(["Q90", "Q456"])).toContain("VALUES ?city { wd:Q90 wd:Q456 }");
   });
+
+  it("finds Dutch towns and stations by the country they name", () => {
+    expect(citiesQuery("NL")).toContain("BIND(wd:Q55 AS ?country)");
+    expect(citiesQuery("NL", true)).toContain("BIND(wd:Q55 AS ?country)");
+    expect(stationsQuery("NL")).toContain("BIND(wd:Q55 AS ?country)");
+    expect(stationsQuery("NL")).not.toContain("P297");
+  });
 });
 
 describe("dataset files", () => {