From d2ada468a186ce3b3d05f717793e90dea00d1133 Mon Sep 17 00:00:00 2001
From: Wander Nauta <info@wandernauta.nl>
Date: Sun, 24 May 2026 14:35:09 +0200
Subject: [PATCH 1/6] move default og:image value to template

---
 partials/base.html |  2 +-
 tkserv.cc          | 22 ----------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/partials/base.html b/partials/base.html
index d455109..57a6f9f 100644
--- a/partials/base.html
+++ b/partials/base.html
@@ -6,7 +6,7 @@
     <meta property='og:title' content='{{ og.title }}'>
     <meta property='og:description' content='{{ og.description }}'>
     <meta property='og:type' content='article'>
-    <meta property='og:image' content='{{og.imageurl}}'>
+    <meta property='og:image' content='{{default(og.imageurl,"")}}'>
     {% block extrameta %} {% endblock %}
     <link rel='stylesheet' href='pico.min.css' />
     <style>
diff --git a/tkserv.cc b/tkserv.cc
index 7385247..5f2d9a4 100644
--- a/tkserv.cc
+++ b/tkserv.cc
@@ -726,7 +726,6 @@ int main(int argc, char** argv)
     data["pagemeta"]["title"]="Mijn";
     data["og"]["title"] = "Mijn";
     data["og"]["description"] = "Mijn";
-    data["og"]["imageurl"] = "";
 
     inja::Environment e;
     e.set_html_autoescape(true);
@@ -748,7 +747,6 @@ int main(int argc, char** argv)
     data["pagemeta"]["title"]="Zoek naar "+htmlEscape(q);
     data["og"]["title"] = "Zoek naar "+htmlEscape(q);
     data["og"]["description"] = "Zoek naar "+htmlEscape(q);
-    data["og"]["imageurl"] = "";
     data["q"] = urlEscape(q);
     inja::Environment e;
     e.set_html_autoescape(false); // !!
@@ -762,7 +760,6 @@ int main(int argc, char** argv)
     data["pagemeta"]["title"]="Alle personen";
     data["og"]["title"] = "Alle personen";
     data["og"]["description"] = "Alle personen";
-    data["og"]["imageurl"] = "";
 
     auto personen = packResultsJson(tp.getLease()->queryT(R"(select min(van) voorheteerst, titels, persoon.nummer, roepnaam,tussenvoegsel,achternaam,json_group_array(distinct(afkorting)) fracties from persoon,fractiezetelpersoon,fractiezetel,fractie where  fractiezetelpersoon.persoonid = persoon.id and fractiezetelpersoon.fractiezetelid = fractiezetel.id and fractie.id=fractiezetel.fractieid group by persoon.id order by achternaam,roepnaam)"));
 
@@ -783,7 +780,6 @@ int main(int argc, char** argv)
     data["pagemeta"]["title"]="Alle open.overheid.nl documenten";
     data["og"]["title"] = "Alle open.overheid.nl documenten";
     data["og"]["description"] = "Alle open.overheid.nl documenten";
-    data["og"]["imageurl"] = "";
 
     /*
       Selection criteria:
@@ -911,7 +907,6 @@ int main(int argc, char** argv)
     data["pagemeta"]["title"]="Toezegging " + nummer;
     data["og"]["title"] = "Toezegging "+nummer;
     data["og"]["description"] = eget(toez[0], "tekst");
-    data["og"]["imageurl"] = "";
     data["toez"]=packResultsJson(toez)[0];
     if(data["toez"]["pnummer"] != "")
       data["toez"]["pfractie"] = getPartyFromNumber(sqlw.get(), (int)data["toez"]["pnummer"]);
@@ -997,7 +992,6 @@ int main(int argc, char** argv)
     z["pagemeta"]["title"]="Zaak "+nummer;
     z["og"]["title"] = "Zaak " + nummer+" | " +  eget(zaken[0], "onderwerp");
     z["og"]["description"] = "Zaak " + eget(zaken[0], "titel") + " | " + eget(zaken[0], "onderwerp");
-    z["og"]["imageurl"] = "";
 
     inja::Environment e;
     e.set_html_autoescape(true);
@@ -1161,7 +1155,6 @@ int main(int argc, char** argv)
       data["pagemeta"]["title"]="";
       data["og"]["title"] = name;
       data["og"]["description"] = name;
-      data["og"]["imageurl"] = "";
 
       res.set_content(e.render_file("./partials/"+file, data), "text/html");
     });
@@ -1254,7 +1247,6 @@ int main(int argc, char** argv)
     data["pagemeta"]["title"]="Hoofdpagina – OpenTK";
     data["og"]["title"] = "Recente documenten";
     data["og"]["description"] = "Recente documenten uit de Tweede Kamer";
-    data["og"]["imageurl"] = "";
     
     res.set_content(e.render_file("./partials/index.html", data), "text/html");
   });
@@ -1327,7 +1319,6 @@ int main(int argc, char** argv)
     data["pagemeta"]["title"]="OpenTK - Toezeggingen";
     data["og"]["title"] = "OpenTK - Toezeggingen";
     data["og"]["description"] = "Toezeggingen van het kabinet";
-    data["og"]["imageurl"] = "";
     data["data"] = filtered;
     data["voortouw"] = commissie;
     data["fractie"] = fractie;
@@ -1481,7 +1472,6 @@ int main(int argc, char** argv)
     data["pagemeta"]["title"]="Open Vragen – OpenTK";
     data["og"]["title"] = "Open vragen";
     data["og"]["description"] = "Open vragen uit de Tweede Kamer";
-    data["og"]["imageurl"] = "";
 
     res.set_content(e.render_file("./partials/open-vragen.html", data), "text/html");
   });
@@ -1541,7 +1531,6 @@ int main(int argc, char** argv)
     data["pagemeta"]["title"]="Besluiten – OpenTK";
     data["og"]["title"] = "Recente en toekomstige besluiten";
     data["og"]["description"] = "Recente en toekomstige besluiten in de Tweede Kamer";
-    data["og"]["imageurl"] = "";
     
     res.set_content(e.render_file("./partials/besluiten.html", data), "text/html");
   });
@@ -1563,7 +1552,6 @@ int main(int argc, char** argv)
     data["pagemeta"]["title"]="Activiteit – OpenTK";
     data["og"]["title"] = act[0]["onderwerp"];
     data["og"]["description"] = (string)act[0]["datum"] + ": "+ (string)act[0]["onderwerp"];
-    data["og"]["imageurl"] = "";
     
     res.set_content(e.render_file("./partials/activiteit.html", data), "text/html");
   });
@@ -1629,7 +1617,6 @@ int main(int argc, char** argv)
     data["pagemeta"]["title"]="Activiteiten – OpenTK";
     data["og"]["title"] = "Activiteiten";
     data["og"]["description"] = "Activiteiten Tweede Kamer";
-    data["og"]["imageurl"] = "";
     
     res.set_content(e.render_file("./partials/activiteiten.html", data), "text/html");
   });
@@ -1674,7 +1661,6 @@ int main(int argc, char** argv)
     data["pagemeta"]["title"]="Ongeplande activiteiten – OpenTK";
     data["og"]["title"] = "Ongeplande activiteiten";
     data["og"]["description"] = "Ongeplande activiteiten Tweede Kamer";
-    data["og"]["imageurl"] = "";
 
     res.set_content(e.render_file("./partials/ongeplande-activiteiten.html", data), "text/html");
   });
@@ -1695,7 +1681,6 @@ int main(int argc, char** argv)
     data["pagemeta"]["title"]= eget(deets[0], "naam");
     data["og"]["title"] = eget(deets[0], "naam");
     data["og"]["description"] = eget(deets[0], "naam");
-    data["og"]["imageurl"] = "";
 
     data["id"] = id;
     data["naam"] = eget(deets[0], "naam");
@@ -1725,7 +1710,6 @@ int main(int argc, char** argv)
     data["pagemeta"]["title"]="";
     data["og"]["title"] = docs[0]["titel"];
     data["og"]["description"] = docs[0]["titel"];
-    data["og"]["imageurl"] = "";
     
     res.set_content(e.render_file("./partials/ksd.html", data), "text/html");
   });
@@ -1932,7 +1916,6 @@ int main(int argc, char** argv)
     data["pagemeta"]["title"]=get<string>(ret[0]["onderwerp"]);
     data["og"]["title"] = get<string>(ret[0]["onderwerp"]);
     data["og"]["description"] = get<string>(ret[0]["titel"]) + " " +get<string>(ret[0]["onderwerp"]);
-    data["og"]["imageurl"] = "";
 
     bulkEscape(data); 
 
@@ -2014,7 +1997,6 @@ int main(int argc, char** argv)
     data["pagemeta"]["title"]=(string)data["titel"];
     data["og"]["title"] = (string)data["titel"];
     data["og"]["description"] = (string)data["updated"] + " " + (string)data["titel"];
-    data["og"]["imageurl"] = "";
 
     bulkEscape(data); 
     data["htmlverslag"]=enrichHTML(getHtmlForDocument(data["id"], true), tp.getLease().get());
@@ -2063,7 +2045,6 @@ int main(int argc, char** argv)
     data["pagemeta"]["title"]=(string)data["titel"];
     data["og"]["title"] = (string)data["titel"];
     data["og"]["description"] = (string)data["mutatiedatumtijd"] + " " + (string)data["titel"];
-    data["og"]["imageurl"] = "";
 
     bulkEscape(data); 
     //    data["htmlverslag"]="";
@@ -2080,7 +2061,6 @@ int main(int argc, char** argv)
     data["pagemeta"]["title"]="Verslagen – OpenTK";
     data["og"]["title"] = "Recente verslagen";
     data["og"]["description"] = "Recente verslagen uit de Tweede Kamer";
-    data["og"]["imageurl"] = "";
     
     res.set_content(e.render_file("./partials/verslagen.html", data), "text/html");
   });
@@ -2158,7 +2138,6 @@ int main(int argc, char** argv)
     data["pagemeta"]["title"]="Stemmingen – OpenTK";
     data["og"]["title"] = "Stemmingen";
     data["og"]["description"] = "Stemmingen";
-    data["og"]["imageurl"] = "";
 
     res.set_content(e.render_file("./partials/stemmingen.html", data), "text/html");
   });
@@ -2359,7 +2338,6 @@ int main(int argc, char** argv)
     data["error"] = data["og"]["title"];
       
     data["og"]["description"] = "Een TKConv error: " + (string)data["error"];
-    data["og"]["imageurl"] = "";
     cout<<"Error: "<<req.path<<" '"<< (string)data["error"] <<"'"<<endl;
     res.set_content(e.render_file("./partials/error.html", data), "text/html");
   });

From 5b9307439fd8b7cd5444d26f618da68245cd1be3 Mon Sep 17 00:00:00 2001
From: Wander Nauta <info@wandernauta.nl>
Date: Sun, 24 May 2026 15:28:12 +0200
Subject: [PATCH 2/6] move pagetitle computation to partials

This removes the `pagemeta` required key and instead uses template
inheritance to compute a page title depending on which partial is being
rendered. This has the following benefits:

- Views that use doTemplate (Commissies, Kamerstukdossiers, etc) can now
  set a proper title.
- The "- OpenTK" suffix is now consistently applied.

The OpenGraph metadata is not touched.
---
 partials/activiteit.html              |  2 ++
 partials/activiteiten.html            |  1 +
 partials/base.html                    |  2 +-
 partials/besluiten.html               |  2 ++
 partials/commissie.html               |  1 +
 partials/commissies.html              |  2 ++
 partials/error.html                   |  1 +
 partials/geschenken.html              |  2 ++
 partials/getorig.html                 |  1 +
 partials/index.html                   |  2 ++
 partials/kamerleden.html              |  1 +
 partials/kamerstukdossiers.html       |  1 +
 partials/ksd.html                     |  1 +
 partials/mijn.html                    |  2 ++
 partials/ongeplande-activiteiten.html |  1 +
 partials/oo.html                      |  2 ++
 partials/oods.html                    |  1 +
 partials/open-vragen.html             |  2 ++
 partials/personen.html                |  1 +
 partials/persoon.html                 |  2 ++
 partials/search.html                  |  2 ++
 partials/stemmingen.html              |  1 +
 partials/toezegging.html              |  2 ++
 partials/toezeggingen.html            |  2 ++
 partials/uitleg.html                  |  4 +---
 partials/verslag.html                 |  2 ++
 partials/verslagen.html               |  2 ++
 partials/zaak.html                    |  3 ++-
 tkserv.cc                             | 24 +-----------------------
 29 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/partials/activiteit.html b/partials/activiteit.html
index 152fdff..49858d2 100644
--- a/partials/activiteit.html
+++ b/partials/activiteit.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% block title %}Activiteit{% endblock %}
+
 {% block div %}
 id="recent-docs" x-data="{
 nummer: '',
diff --git a/partials/activiteiten.html b/partials/activiteiten.html
index 683b53d..81a6010 100644
--- a/partials/activiteiten.html
+++ b/partials/activiteiten.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block title %}Activiteiten{% endblock %}
 
 {% block main %}
 <h4>Recente en toekomstige activiteiten
diff --git a/partials/base.html b/partials/base.html
index 57a6f9f..643e253 100644
--- a/partials/base.html
+++ b/partials/base.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>{{ pagemeta.title }}</title>
+    <title>{% block title %}{% endblock %} – OpenTK</title>
     <meta charset="utf-8">
     <meta property='og:title' content='{{ og.title }}'>
     <meta property='og:description' content='{{ og.description }}'>
diff --git a/partials/besluiten.html b/partials/besluiten.html
index c230508..9ce26c8 100644
--- a/partials/besluiten.html
+++ b/partials/besluiten.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% block title %}Besluiten{% endblock %}
+
 {% block div %}
 {% endblock %}
 
diff --git a/partials/commissie.html b/partials/commissie.html
index 42ee38f..367c45d 100644
--- a/partials/commissie.html
+++ b/partials/commissie.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block title %}{{ naam }}{% endblock %}
 
 {% block javascript %}
 <script defer src="user.js"></script>
diff --git a/partials/commissies.html b/partials/commissies.html
index 7793e26..74ac1dc 100644
--- a/partials/commissies.html
+++ b/partials/commissies.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% block title %}Commissies{% endblock %}
+
 {% block div %}
 {% endblock %}
 
diff --git a/partials/error.html b/partials/error.html
index 8322a9b..7d065d3 100644
--- a/partials/error.html
+++ b/partials/error.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block title %}Error{% endblock %}
 
 {% block main %}
 <hr>
diff --git a/partials/geschenken.html b/partials/geschenken.html
index ae73eb5..56a4253 100644
--- a/partials/geschenken.html
+++ b/partials/geschenken.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% block title %}Geschenken{% endblock %}
+
 {% block div %}{% endblock %}
 
 {% block main %}
diff --git a/partials/getorig.html b/partials/getorig.html
index 8d4287d..61cb6f5 100644
--- a/partials/getorig.html
+++ b/partials/getorig.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block title %}{{ meta.onderwerp }}{% endblock %}
 
 {% block javascript %}
 <script defer src="user.js"></script>
diff --git a/partials/index.html b/partials/index.html
index f166640..c4e9512 100644
--- a/partials/index.html
+++ b/partials/index.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% block title %}Hoofdpagina{% endblock %}
+
 {% block javascript %}{% endblock %}
 {% block div %}{% endblock %}
 
diff --git a/partials/kamerleden.html b/partials/kamerleden.html
index edead08..0e92482 100644
--- a/partials/kamerleden.html
+++ b/partials/kamerleden.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block title %}Kamerleden{% endblock %}
 
 {% block main %}
 
diff --git a/partials/kamerstukdossiers.html b/partials/kamerstukdossiers.html
index 304e765..01a01af 100644
--- a/partials/kamerstukdossiers.html
+++ b/partials/kamerstukdossiers.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block title %}Kamerstukdossiers{% endblock %}
 
 {% block div %}
 x-data="{  kamerstukdossiers: []  }" x-init="getGenKSD('recent-kamerstukdossiers', 'kamerstukdossiers', $data);"
diff --git a/partials/ksd.html b/partials/ksd.html
index 5125e00..488ae14 100644
--- a/partials/ksd.html
+++ b/partials/ksd.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block title %}{{ meta.titel }}{% endblock %}
 
 {% block javascript %}
 <script defer src="user.js"></script>
diff --git a/partials/mijn.html b/partials/mijn.html
index bcad18c..ceccbec 100644
--- a/partials/mijn.html
+++ b/partials/mijn.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% block title %}Mijn{% endblock %}
+
 {% block div %}
 id="recent-docs" x-data='{
 email: "",
diff --git a/partials/ongeplande-activiteiten.html b/partials/ongeplande-activiteiten.html
index a3340f8..47d65e1 100644
--- a/partials/ongeplande-activiteiten.html
+++ b/partials/ongeplande-activiteiten.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block title %}Ongeplande activiteiten{% endblock %}
 
 {% block main %}
 <h4>Nog ongeplande activiteiten
diff --git a/partials/oo.html b/partials/oo.html
index aaab2e7..25b2678 100644
--- a/partials/oo.html
+++ b/partials/oo.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% block title %}{{ titel }}{% endblock %}
+
 {% block div %}
 {% endblock %}
 
diff --git a/partials/oods.html b/partials/oods.html
index 3dbdc32..cb7010f 100644
--- a/partials/oods.html
+++ b/partials/oods.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block title %}Alle open.overheid.nl documenten{% endblock %}
 
 {% block div %}
 x-data="{
diff --git a/partials/open-vragen.html b/partials/open-vragen.html
index eb2738f..9f287aa 100644
--- a/partials/open-vragen.html
+++ b/partials/open-vragen.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% block title %}Open vragen{% endblock %}
+
 {% block div %}
 {% endblock %}
 {% block javascript %}
diff --git a/partials/personen.html b/partials/personen.html
index cfa66b1..779d430 100644
--- a/partials/personen.html
+++ b/partials/personen.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block title %}Alle personen{% endblock %}
 
 {% block main %}
 <h4>Kamerleden en veel voormalige kamerleden</h4>
diff --git a/partials/persoon.html b/partials/persoon.html
index c5862b5..f2c367c 100644
--- a/partials/persoon.html
+++ b/partials/persoon.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% block title %}Kamerlid{% endblock %}
+
 {% block div %}
 x-data="{
 haveMonitor: false,
diff --git a/partials/search.html b/partials/search.html
index 857b932..232a4f3 100644
--- a/partials/search.html
+++ b/partials/search.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% block title %}Zoek naar {{h}}{% endblock %}
+
 {% block div %}
 x-data="{
 foundDocs: [],
diff --git a/partials/stemmingen.html b/partials/stemmingen.html
index 5707ab1..4e6c3e9 100644
--- a/partials/stemmingen.html
+++ b/partials/stemmingen.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block title %}Stemmingen{% endblock %}
 
 {% block div %}
 {% endblock %}
diff --git a/partials/toezegging.html b/partials/toezegging.html
index 3520025..678c202 100644
--- a/partials/toezegging.html
+++ b/partials/toezegging.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% block title %}Toezegging {{toez.tnummer}}{% endblock %}
+
 {% block div %}
 {% endblock %}
 
diff --git a/partials/toezeggingen.html b/partials/toezeggingen.html
index b2e50eb..3271bf1 100644
--- a/partials/toezeggingen.html
+++ b/partials/toezeggingen.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% block title %}Toezeggingen{% endblock %}
+
 {% block div %}
 x-data="{
 haveMonitor: false,
diff --git a/partials/uitleg.html b/partials/uitleg.html
index 5a60eaf..1507d0f 100644
--- a/partials/uitleg.html
+++ b/partials/uitleg.html
@@ -1,8 +1,7 @@
 {% extends "base.html" %}
+{% block title %}Uitleg en tips{% endblock %}
 
 {% block main %}
-
-
 <h4>Uitleg en tips</h4>
 In deze twee blog-posts staan uitleg met screenshots:
 <p>
@@ -55,4 +54,3 @@ <h5 id="monitors">Monitors</h5>
 </p> 
 
 {% endblock %}
-	
diff --git a/partials/verslag.html b/partials/verslag.html
index 8b22682..7935b50 100644
--- a/partials/verslag.html
+++ b/partials/verslag.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% block title %}{{titel}}{% endblock %}
+
 {% block div %}
 {% endblock %}
 
diff --git a/partials/verslagen.html b/partials/verslagen.html
index 3161252..ccc8627 100644
--- a/partials/verslagen.html
+++ b/partials/verslagen.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% block title %}Verslagen{% endblock %}
+
 {% block main %}
 <h4>Verslagen</h4>
 <table class="striped">
diff --git a/partials/zaak.html b/partials/zaak.html
index 783cd7b..5d6bec9 100644
--- a/partials/zaak.html
+++ b/partials/zaak.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% block title %}Zaak {{zaak.nummer}}{% endblock %}
+
 {% block div %}
 x-data="{
 haveMonitor: false,
@@ -8,7 +10,6 @@
 }" x-init="checkMonitor($data)"
 {% endblock %}
 
-
 {% block javascript %}
 <script defer src="user.js"></script>
 {{ super() }}
diff --git a/tkserv.cc b/tkserv.cc
index 5f2d9a4..836e3e7 100644
--- a/tkserv.cc
+++ b/tkserv.cc
@@ -705,7 +705,6 @@ int main(int argc, char** argv)
 
     j["openvragen"] = packResultsJson(sqlw->queryT("select substr(openvragen.gestartOp, 0, 11) sdatum, aantal, openvragen.* from openvragen,zaakactor,zaak,persoon left join SchriftelijkeVraagStat on SchriftelijkeVraagStat.documentNummer = openvragen.docunummer  where persoon.id=persoonid and zaak.id = openvragen.id and zaak.id = zaakactor.zaakid and relatie='Indiener' and persoon.id=? order by sdatum asc", {persoonId}));
 
-    j["pagemeta"]["title"]="Kamerlid";
     string tv = lid[0]["tussenvoegsel"];
     if(!tv.empty())
       tv += ' ';
@@ -723,7 +722,6 @@ int main(int argc, char** argv)
 
   sws.wrapGet({}, "/mijn.html", [&tp](auto& cr) {
     nlohmann::json data;
-    data["pagemeta"]["title"]="Mijn";
     data["og"]["title"] = "Mijn";
     data["og"]["description"] = "Mijn";
 
@@ -744,10 +742,10 @@ int main(int argc, char** argv)
   sws.wrapGet({}, "/search.html", [&tp](auto& cr) {
     string q = cr.req.get_param_value("q");
     nlohmann::json data;
-    data["pagemeta"]["title"]="Zoek naar "+htmlEscape(q);
     data["og"]["title"] = "Zoek naar "+htmlEscape(q);
     data["og"]["description"] = "Zoek naar "+htmlEscape(q);
     data["q"] = urlEscape(q);
+    data["h"] = htmlEscape(q);
     inja::Environment e;
     e.set_html_autoescape(false); // !!
       
@@ -757,7 +755,6 @@ int main(int argc, char** argv)
 
   sws.wrapGet({}, "/personen.html", [&tp](auto& cr) {
     nlohmann::json data;
-    data["pagemeta"]["title"]="Alle personen";
     data["og"]["title"] = "Alle personen";
     data["og"]["description"] = "Alle personen";
 
@@ -777,7 +774,6 @@ int main(int argc, char** argv)
 
   sws.wrapGet({}, "/oods.html", [&tp](auto& cr) {
     nlohmann::json data;
-    data["pagemeta"]["title"]="Alle open.overheid.nl documenten";
     data["og"]["title"] = "Alle open.overheid.nl documenten";
     data["og"]["description"] = "Alle open.overheid.nl documenten";
 
@@ -904,7 +900,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
     
-    data["pagemeta"]["title"]="Toezegging " + nummer;
     data["og"]["title"] = "Toezegging "+nummer;
     data["og"]["description"] = eget(toez[0], "tekst");
     data["toez"]=packResultsJson(toez)[0];
@@ -989,7 +984,6 @@ int main(int argc, char** argv)
     }
     z["adocs"] = adocs;
     // XXX agendapunt multi
-    z["pagemeta"]["title"]="Zaak "+nummer;
     z["og"]["title"] = "Zaak " + nummer+" | " +  eget(zaken[0], "onderwerp");
     z["og"]["description"] = "Zaak " + eget(zaken[0], "titel") + " | " + eget(zaken[0], "onderwerp");
 
@@ -1152,7 +1146,6 @@ int main(int argc, char** argv)
       if(!q.empty())
 	data["data"] = packResultsJson(tp.getLease()->queryT(q));
       
-      data["pagemeta"]["title"]="";
       data["og"]["title"] = name;
       data["og"]["description"] = name;
 
@@ -1244,7 +1237,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
 
-    data["pagemeta"]["title"]="Hoofdpagina – OpenTK";
     data["og"]["title"] = "Recente documenten";
     data["og"]["description"] = "Recente documenten uit de Tweede Kamer";
     
@@ -1316,7 +1308,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
     nlohmann::json data;
-    data["pagemeta"]["title"]="OpenTK - Toezeggingen";
     data["og"]["title"] = "OpenTK - Toezeggingen";
     data["og"]["description"] = "Toezeggingen van het kabinet";
     data["data"] = filtered;
@@ -1469,7 +1460,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
 
-    data["pagemeta"]["title"]="Open Vragen – OpenTK";
     data["og"]["title"] = "Open vragen";
     data["og"]["description"] = "Open vragen uit de Tweede Kamer";
 
@@ -1528,7 +1518,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
 
-    data["pagemeta"]["title"]="Besluiten – OpenTK";
     data["og"]["title"] = "Recente en toekomstige besluiten";
     data["og"]["description"] = "Recente en toekomstige besluiten in de Tweede Kamer";
     
@@ -1549,7 +1538,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
 
-    data["pagemeta"]["title"]="Activiteit – OpenTK";
     data["og"]["title"] = act[0]["onderwerp"];
     data["og"]["description"] = (string)act[0]["datum"] + ": "+ (string)act[0]["onderwerp"];
     
@@ -1614,7 +1602,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(false); // NOTE WELL!
 
-    data["pagemeta"]["title"]="Activiteiten – OpenTK";
     data["og"]["title"] = "Activiteiten";
     data["og"]["description"] = "Activiteiten Tweede Kamer";
     
@@ -1658,7 +1645,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(false); // NOTE WELL!
 
-    data["pagemeta"]["title"]="Ongeplande activiteiten – OpenTK";
     data["og"]["title"] = "Ongeplande activiteiten";
     data["og"]["description"] = "Ongeplande activiteiten Tweede Kamer";
 
@@ -1678,7 +1664,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
     nlohmann::json data;
-    data["pagemeta"]["title"]= eget(deets[0], "naam");
     data["og"]["title"] = eget(deets[0], "naam");
     data["og"]["description"] = eget(deets[0], "naam");
 
@@ -1707,7 +1692,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
 
-    data["pagemeta"]["title"]="";
     data["og"]["title"] = docs[0]["titel"];
     data["og"]["description"] = docs[0]["titel"];
     
@@ -1913,7 +1897,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(false);
 
-    data["pagemeta"]["title"]=get<string>(ret[0]["onderwerp"]);
     data["og"]["title"] = get<string>(ret[0]["onderwerp"]);
     data["og"]["description"] = get<string>(ret[0]["titel"]) + " " +get<string>(ret[0]["onderwerp"]);
 
@@ -1994,7 +1977,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(false); // XX 
 
-    data["pagemeta"]["title"]=(string)data["titel"];
     data["og"]["title"] = (string)data["titel"];
     data["og"]["description"] = (string)data["updated"] + " " + (string)data["titel"];
 
@@ -2042,7 +2024,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(false); // XX 
 
-    data["pagemeta"]["title"]=(string)data["titel"];
     data["og"]["title"] = (string)data["titel"];
     data["og"]["description"] = (string)data["mutatiedatumtijd"] + " " + (string)data["titel"];
 
@@ -2058,7 +2039,6 @@ int main(int argc, char** argv)
     e.set_html_autoescape(true);
     nlohmann::json data;
     data["recenteVerslagen"] = packResultsJson(tmp);
-    data["pagemeta"]["title"]="Verslagen – OpenTK";
     data["og"]["title"] = "Recente verslagen";
     data["og"]["description"] = "Recente verslagen uit de Tweede Kamer";
     
@@ -2135,7 +2115,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true); 
 
-    data["pagemeta"]["title"]="Stemmingen – OpenTK";
     data["og"]["title"] = "Stemmingen";
     data["og"]["description"] = "Stemmingen";
 
@@ -2333,7 +2312,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
     nlohmann::json data;
-    data["pagemeta"]["title"]="Error – OpenTK";
     data["og"]["title"] = fmt::format("Error {} {} @ {}", res.status, httplib::status_message(res.status), time(0));
     data["error"] = data["og"]["title"];
       

From 8e9c659c38bb349e30d0bcfa71e25bb377c4cf73 Mon Sep 17 00:00:00 2001
From: Wander Nauta <info@wandernauta.nl>
Date: Sun, 24 May 2026 15:37:52 +0200
Subject: [PATCH 3/6] remove unused empty div template blocks

---
 partials/besluiten.html   | 3 ---
 partials/commissies.html  | 3 ---
 partials/geschenken.html  | 2 --
 partials/index.html       | 1 -
 partials/oo.html          | 3 ---
 partials/open-vragen.html | 2 --
 partials/stemmingen.html  | 4 ----
 partials/toezegging.html  | 3 ---
 partials/verslag.html     | 3 ---
 9 files changed, 24 deletions(-)

diff --git a/partials/besluiten.html b/partials/besluiten.html
index 9ce26c8..75c81f9 100644
--- a/partials/besluiten.html
+++ b/partials/besluiten.html
@@ -1,9 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Besluiten{% endblock %}
 
-{% block div %}
-{% endblock %}
-
 {% block main %}
 <h4>Recente en toekomstige besluiten</h4>
 <table class="striped">
diff --git a/partials/commissies.html b/partials/commissies.html
index 74ac1dc..6eaa4fb 100644
--- a/partials/commissies.html
+++ b/partials/commissies.html
@@ -1,9 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Commissies{% endblock %}
 
-{% block div %}
-{% endblock %}
-
 {% block javascript %}
 {% endblock %}
 
diff --git a/partials/geschenken.html b/partials/geschenken.html
index 56a4253..6aef079 100644
--- a/partials/geschenken.html
+++ b/partials/geschenken.html
@@ -1,8 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Geschenken{% endblock %}
 
-{% block div %}{% endblock %}
-
 {% block main %}
 <h4>Geschenken</h4>
     <table class="striped">
diff --git a/partials/index.html b/partials/index.html
index c4e9512..870dc33 100644
--- a/partials/index.html
+++ b/partials/index.html
@@ -2,7 +2,6 @@
 {% block title %}Hoofdpagina{% endblock %}
 
 {% block javascript %}{% endblock %}
-{% block div %}{% endblock %}
 
 {% block extrameta %}
 <link rel="alternate" type="application/rss+xml" href="https://berthub.eu/tkconv/index.xml" title="OpenTK Meest recente parlementaire documenten" />
diff --git a/partials/oo.html b/partials/oo.html
index 25b2678..7a404c3 100644
--- a/partials/oo.html
+++ b/partials/oo.html
@@ -1,9 +1,6 @@
 {% extends "base.html" %}
 {% block title %}{{ titel }}{% endblock %}
 
-{% block div %}
-{% endblock %}
-
 {% block javascript %}
 {% endblock %}
 
diff --git a/partials/open-vragen.html b/partials/open-vragen.html
index 9f287aa..13d7581 100644
--- a/partials/open-vragen.html
+++ b/partials/open-vragen.html
@@ -1,8 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Open vragen{% endblock %}
 
-{% block div %}
-{% endblock %}
 {% block javascript %}
 {% endblock %}
 
diff --git a/partials/stemmingen.html b/partials/stemmingen.html
index 4e6c3e9..02244a7 100644
--- a/partials/stemmingen.html
+++ b/partials/stemmingen.html
@@ -1,10 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Stemmingen{% endblock %}
 
-{% block div %}
-{% endblock %}
-
-
 {% block main %}
 <h4>Recente stemmingen (afgelopen {{weken}} weken)</h4>
 <table class="striped">
diff --git a/partials/toezegging.html b/partials/toezegging.html
index 678c202..57c80f7 100644
--- a/partials/toezegging.html
+++ b/partials/toezegging.html
@@ -1,9 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Toezegging {{toez.tnummer}}{% endblock %}
 
-{% block div %}
-{% endblock %}
-
 {% block javascript %}
 {% endblock %}
 
diff --git a/partials/verslag.html b/partials/verslag.html
index 7935b50..83fb17b 100644
--- a/partials/verslag.html
+++ b/partials/verslag.html
@@ -1,9 +1,6 @@
 {% extends "base.html" %}
 {% block title %}{{titel}}{% endblock %}
 
-{% block div %}
-{% endblock %}
-
 {% block javascript %}
 {% endblock %}
 

From c8dd52b9074158fd15bc1267ba10f6f191f2fb1e Mon Sep 17 00:00:00 2001
From: Wander Nauta <info@wandernauta.nl>
Date: Sun, 24 May 2026 15:40:38 +0200
Subject: [PATCH 4/6] remove unused empty javascript template blocks

---
 partials/commissies.html  | 3 ---
 partials/index.html       | 2 --
 partials/oo.html          | 4 ----
 partials/open-vragen.html | 3 ---
 partials/toezegging.html  | 3 ---
 partials/verslag.html     | 3 ---
 6 files changed, 18 deletions(-)

diff --git a/partials/commissies.html b/partials/commissies.html
index 6eaa4fb..dc31cab 100644
--- a/partials/commissies.html
+++ b/partials/commissies.html
@@ -1,9 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Commissies{% endblock %}
 
-{% block javascript %}
-{% endblock %}
-
 {% block main %}
 <h4>Commissies</h4>
 <h5>Actief</h5>
diff --git a/partials/index.html b/partials/index.html
index 870dc33..d85d8dd 100644
--- a/partials/index.html
+++ b/partials/index.html
@@ -1,8 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Hoofdpagina{% endblock %}
 
-{% block javascript %}{% endblock %}
-
 {% block extrameta %}
 <link rel="alternate" type="application/rss+xml" href="https://berthub.eu/tkconv/index.xml" title="OpenTK Meest recente parlementaire documenten" />
 {% endblock %}
diff --git a/partials/oo.html b/partials/oo.html
index 7a404c3..8eb1bf6 100644
--- a/partials/oo.html
+++ b/partials/oo.html
@@ -1,10 +1,6 @@
 {% extends "base.html" %}
 {% block title %}{{ titel }}{% endblock %}
 
-{% block javascript %}
-{% endblock %}
-
-
 {% block main %}
 <hgroup>
 <h1>{{ titel }}</h1>
diff --git a/partials/open-vragen.html b/partials/open-vragen.html
index 13d7581..d4e1845 100644
--- a/partials/open-vragen.html
+++ b/partials/open-vragen.html
@@ -1,9 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Open vragen{% endblock %}
 
-{% block javascript %}
-{% endblock %}
-
 {% block customheader %}
 <p>{{ aantalvragen }} open vragen, in {{ length(openVragen) }} documenten (waarvan <font color="#ff0000">{{ totlaatzonderuitstel }}</font> te laat zonder uitstel)</p>
 {% endblock %}
diff --git a/partials/toezegging.html b/partials/toezegging.html
index 57c80f7..71bef24 100644
--- a/partials/toezegging.html
+++ b/partials/toezegging.html
@@ -1,9 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Toezegging {{toez.tnummer}}{% endblock %}
 
-{% block javascript %}
-{% endblock %}
-
 {% block customheader %}
 <p></p>
 <h4>Toezegging {{toez.tnummer}} ({{toez.status}})</h4>
diff --git a/partials/verslag.html b/partials/verslag.html
index 83fb17b..ae4eb56 100644
--- a/partials/verslag.html
+++ b/partials/verslag.html
@@ -1,9 +1,6 @@
 {% extends "base.html" %}
 {% block title %}{{titel}}{% endblock %}
 
-{% block javascript %}
-{% endblock %}
-
 {% block customheader %}
 <h5>Datum {{datum}}. Laatste update: {{updated}}</h5>
 <h5>{{zaal}}</h5>

From 19c3b92aae46dd50060584708697c1804569f9b7 Mon Sep 17 00:00:00 2001
From: Wander Nauta <info@wandernauta.nl>
Date: Sun, 24 May 2026 16:05:54 +0200
Subject: [PATCH 5/6] move og.title computation to partials

---
 partials/activiteit.html              |  1 +
 partials/activiteiten.html            |  1 +
 partials/base.html                    |  2 +-
 partials/besluiten.html               |  1 +
 partials/commissie.html               |  1 +
 partials/commissies.html              |  1 +
 partials/error.html                   |  1 +
 partials/geschenken.html              |  1 +
 partials/getorig.html                 |  1 +
 partials/index.html                   |  1 +
 partials/kamerleden.html              |  1 +
 partials/ksd.html                     |  1 +
 partials/mijn.html                    |  1 +
 partials/ongeplande-activiteiten.html |  1 +
 partials/oo.html                      |  1 +
 partials/oods.html                    |  1 +
 partials/open-vragen.html             |  1 +
 partials/personen.html                |  1 +
 partials/persoon.html                 |  1 +
 partials/search.html                  |  3 ++-
 partials/stemmingen.html              |  1 +
 partials/toezegging.html              |  1 +
 partials/toezeggingen.html            |  1 +
 partials/uitleg.html                  |  1 +
 partials/verslag.html                 |  1 +
 partials/verslagen.html               |  1 +
 partials/zaak.html                    |  1 +
 tkserv.cc                             | 35 ++++-----------------------
 28 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/partials/activiteit.html b/partials/activiteit.html
index 49858d2..aeb48c2 100644
--- a/partials/activiteit.html
+++ b/partials/activiteit.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Activiteit{% endblock %}
+{% block og.title %}{{ onderwerp }}{% endblock %}
 
 {% block div %}
 id="recent-docs" x-data="{
diff --git a/partials/activiteiten.html b/partials/activiteiten.html
index 81a6010..48dfe23 100644
--- a/partials/activiteiten.html
+++ b/partials/activiteiten.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Activiteiten{% endblock %}
+{% block og.title %}Activiteiten{% endblock %}
 
 {% block main %}
 <h4>Recente en toekomstige activiteiten
diff --git a/partials/base.html b/partials/base.html
index 643e253..be0c456 100644
--- a/partials/base.html
+++ b/partials/base.html
@@ -3,7 +3,7 @@
   <head>
     <title>{% block title %}{% endblock %} – OpenTK</title>
     <meta charset="utf-8">
-    <meta property='og:title' content='{{ og.title }}'>
+    <meta property='og:title' content='{% block og.title %}{% endblock %}'>
     <meta property='og:description' content='{{ og.description }}'>
     <meta property='og:type' content='article'>
     <meta property='og:image' content='{{default(og.imageurl,"")}}'>
diff --git a/partials/besluiten.html b/partials/besluiten.html
index 75c81f9..974d162 100644
--- a/partials/besluiten.html
+++ b/partials/besluiten.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Besluiten{% endblock %}
+{% block og.title %}Recente en toekomstige besluiten{% endblock %}
 
 {% block main %}
 <h4>Recente en toekomstige besluiten</h4>
diff --git a/partials/commissie.html b/partials/commissie.html
index 367c45d..53bbd04 100644
--- a/partials/commissie.html
+++ b/partials/commissie.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}{{ naam }}{% endblock %}
+{% block og.title %}{{ naam }}{% endblock %}
 
 {% block javascript %}
 <script defer src="user.js"></script>
diff --git a/partials/commissies.html b/partials/commissies.html
index dc31cab..6dcbf5b 100644
--- a/partials/commissies.html
+++ b/partials/commissies.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Commissies{% endblock %}
+{% block og.title %}Commissies van de Tweede Kamer{% endblock %}
 
 {% block main %}
 <h4>Commissies</h4>
diff --git a/partials/error.html b/partials/error.html
index 7d065d3..70a4f0c 100644
--- a/partials/error.html
+++ b/partials/error.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Error{% endblock %}
+{% block og.title %}{{ error }}{% endblock %}
 
 {% block main %}
 <hr>
diff --git a/partials/geschenken.html b/partials/geschenken.html
index 6aef079..d68d30a 100644
--- a/partials/geschenken.html
+++ b/partials/geschenken.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Geschenken{% endblock %}
+{% block og.title %}Geschenken ontvangen door leden van de Tweede Kamer{% endblock %}
 
 {% block main %}
 <h4>Geschenken</h4>
diff --git a/partials/getorig.html b/partials/getorig.html
index 61cb6f5..f8299e4 100644
--- a/partials/getorig.html
+++ b/partials/getorig.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}{{ meta.onderwerp }}{% endblock %}
+{% block og.title %}{{ meta.onderwerp }}{% endblock %}
 
 {% block javascript %}
 <script defer src="user.js"></script>
diff --git a/partials/index.html b/partials/index.html
index d85d8dd..6f969de 100644
--- a/partials/index.html
+++ b/partials/index.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Hoofdpagina{% endblock %}
+{% block og.title %}Recente documenten{% endblock %}
 
 {% block extrameta %}
 <link rel="alternate" type="application/rss+xml" href="https://berthub.eu/tkconv/index.xml" title="OpenTK Meest recente parlementaire documenten" />
diff --git a/partials/kamerleden.html b/partials/kamerleden.html
index 0e92482..8016be9 100644
--- a/partials/kamerleden.html
+++ b/partials/kamerleden.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Kamerleden{% endblock %}
+{% block og.title %}Leden van de Tweede Kamer{% endblock %}
 
 {% block main %}
 
diff --git a/partials/ksd.html b/partials/ksd.html
index 488ae14..7ff84ad 100644
--- a/partials/ksd.html
+++ b/partials/ksd.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}{{ meta.titel }}{% endblock %}
+{% block og.title %}{{ meta.titel }}{% endblock %}
 
 {% block javascript %}
 <script defer src="user.js"></script>
diff --git a/partials/mijn.html b/partials/mijn.html
index ceccbec..e3647ae 100644
--- a/partials/mijn.html
+++ b/partials/mijn.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Mijn{% endblock %}
+{% block og.title %}Mijn{% endblock %}
 
 {% block div %}
 id="recent-docs" x-data='{
diff --git a/partials/ongeplande-activiteiten.html b/partials/ongeplande-activiteiten.html
index 47d65e1..c8faf75 100644
--- a/partials/ongeplande-activiteiten.html
+++ b/partials/ongeplande-activiteiten.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Ongeplande activiteiten{% endblock %}
+{% block og.title %}Ongeplande activiteiten{% endblock %}
 
 {% block main %}
 <h4>Nog ongeplande activiteiten
diff --git a/partials/oo.html b/partials/oo.html
index 8eb1bf6..c222c38 100644
--- a/partials/oo.html
+++ b/partials/oo.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}{{ titel }}{% endblock %}
+{% block og.title %}{{ titel }}{% endblock %}
 
 {% block main %}
 <hgroup>
diff --git a/partials/oods.html b/partials/oods.html
index cb7010f..b13fee8 100644
--- a/partials/oods.html
+++ b/partials/oods.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Alle open.overheid.nl documenten{% endblock %}
+{% block og.title %}Alle open.overheid.nl documenten{% endblock %}
 
 {% block div %}
 x-data="{
diff --git a/partials/open-vragen.html b/partials/open-vragen.html
index d4e1845..ba080e9 100644
--- a/partials/open-vragen.html
+++ b/partials/open-vragen.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Open vragen{% endblock %}
+{% block og.title %}Open vragen{% endblock %}
 
 {% block customheader %}
 <p>{{ aantalvragen }} open vragen, in {{ length(openVragen) }} documenten (waarvan <font color="#ff0000">{{ totlaatzonderuitstel }}</font> te laat zonder uitstel)</p>
diff --git a/partials/personen.html b/partials/personen.html
index 779d430..f00c6e0 100644
--- a/partials/personen.html
+++ b/partials/personen.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Alle personen{% endblock %}
+{% block og.title %}Alle personen{% endblock %}
 
 {% block main %}
 <h4>Kamerleden en veel voormalige kamerleden</h4>
diff --git a/partials/persoon.html b/partials/persoon.html
index f2c367c..4573bf7 100644
--- a/partials/persoon.html
+++ b/partials/persoon.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Kamerlid{% endblock %}
+{% block og.title %}{{meta.roepnaam}} {% if meta.tussenvoegsel != "" %}{{meta.tussenvoegsel}} {% endif %}{{meta.achternaam}}{% endblock %}
 
 {% block div %}
 x-data="{
diff --git a/partials/search.html b/partials/search.html
index 232a4f3..edc0106 100644
--- a/partials/search.html
+++ b/partials/search.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
-{% block title %}Zoek naar {{h}}{% endblock %}
+{% block title %}{% if h != "" %}Zoek naar {{h}}{% else %}Zoeken{% endif %}{% endblock %}
+{% block og.title %}{% if h != "" %}Zoek naar {{h}}{% else %}Zoeken{% endif %}{% endblock %}
 
 {% block div %}
 x-data="{
diff --git a/partials/stemmingen.html b/partials/stemmingen.html
index 02244a7..e79e53a 100644
--- a/partials/stemmingen.html
+++ b/partials/stemmingen.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Stemmingen{% endblock %}
+{% block og.title %}Stemmingen{% endblock %}
 
 {% block main %}
 <h4>Recente stemmingen (afgelopen {{weken}} weken)</h4>
diff --git a/partials/toezegging.html b/partials/toezegging.html
index 71bef24..dc3b06f 100644
--- a/partials/toezegging.html
+++ b/partials/toezegging.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Toezegging {{toez.tnummer}}{% endblock %}
+{% block og.title %}Toezegging {{toez.tnummer}}{% endblock %}
 
 {% block customheader %}
 <p></p>
diff --git a/partials/toezeggingen.html b/partials/toezeggingen.html
index 3271bf1..6e4a07f 100644
--- a/partials/toezeggingen.html
+++ b/partials/toezeggingen.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Toezeggingen{% endblock %}
+{% block og.title %}Toezeggingen{% endblock %}
 
 {% block div %}
 x-data="{
diff --git a/partials/uitleg.html b/partials/uitleg.html
index 1507d0f..746dbcc 100644
--- a/partials/uitleg.html
+++ b/partials/uitleg.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Uitleg en tips{% endblock %}
+{% block og.title %}Uitleg en tips{% endblock %}
 
 {% block main %}
 <h4>Uitleg en tips</h4>
diff --git a/partials/verslag.html b/partials/verslag.html
index ae4eb56..dc9ea23 100644
--- a/partials/verslag.html
+++ b/partials/verslag.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}{{titel}}{% endblock %}
+{% block og.title %}{{titel}}{% endblock %}
 
 {% block customheader %}
 <h5>Datum {{datum}}. Laatste update: {{updated}}</h5>
diff --git a/partials/verslagen.html b/partials/verslagen.html
index ccc8627..08feaca 100644
--- a/partials/verslagen.html
+++ b/partials/verslagen.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Verslagen{% endblock %}
+{% block og.title %}Recente verslagen{% endblock %}
 
 {% block main %}
 <h4>Verslagen</h4>
diff --git a/partials/zaak.html b/partials/zaak.html
index 5d6bec9..7190cbe 100644
--- a/partials/zaak.html
+++ b/partials/zaak.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Zaak {{zaak.nummer}}{% endblock %}
+{% block og.title %}Zaak {{zaak.nummer} | {{zaak.onderwerp}}{% endblock %}
 
 {% block div %}
 x-data="{
diff --git a/tkserv.cc b/tkserv.cc
index 836e3e7..07cc9be 100644
--- a/tkserv.cc
+++ b/tkserv.cc
@@ -705,11 +705,6 @@ int main(int argc, char** argv)
 
     j["openvragen"] = packResultsJson(sqlw->queryT("select substr(openvragen.gestartOp, 0, 11) sdatum, aantal, openvragen.* from openvragen,zaakactor,zaak,persoon left join SchriftelijkeVraagStat on SchriftelijkeVraagStat.documentNummer = openvragen.docunummer  where persoon.id=persoonid and zaak.id = openvragen.id and zaak.id = zaakactor.zaakid and relatie='Indiener' and persoon.id=? order by sdatum asc", {persoonId}));
 
-    string tv = lid[0]["tussenvoegsel"];
-    if(!tv.empty())
-      tv += ' ';
-    
-    j["og"]["title"] = (string)lid[0]["roepnaam"] + " "+tv + (string)lid[0]["achternaam"];
     j["og"]["description"] = (string)lid[0]["functie"];
     j["og"]["imageurl"] = "https://berthub.eu/tkconv/personphoto/"+to_string(nummer);
 
@@ -722,7 +717,6 @@ int main(int argc, char** argv)
 
   sws.wrapGet({}, "/mijn.html", [&tp](auto& cr) {
     nlohmann::json data;
-    data["og"]["title"] = "Mijn";
     data["og"]["description"] = "Mijn";
 
     inja::Environment e;
@@ -742,7 +736,6 @@ int main(int argc, char** argv)
   sws.wrapGet({}, "/search.html", [&tp](auto& cr) {
     string q = cr.req.get_param_value("q");
     nlohmann::json data;
-    data["og"]["title"] = "Zoek naar "+htmlEscape(q);
     data["og"]["description"] = "Zoek naar "+htmlEscape(q);
     data["q"] = urlEscape(q);
     data["h"] = htmlEscape(q);
@@ -755,7 +748,6 @@ int main(int argc, char** argv)
 
   sws.wrapGet({}, "/personen.html", [&tp](auto& cr) {
     nlohmann::json data;
-    data["og"]["title"] = "Alle personen";
     data["og"]["description"] = "Alle personen";
 
     auto personen = packResultsJson(tp.getLease()->queryT(R"(select min(van) voorheteerst, titels, persoon.nummer, roepnaam,tussenvoegsel,achternaam,json_group_array(distinct(afkorting)) fracties from persoon,fractiezetelpersoon,fractiezetel,fractie where  fractiezetelpersoon.persoonid = persoon.id and fractiezetelpersoon.fractiezetelid = fractiezetel.id and fractie.id=fractiezetel.fractieid group by persoon.id order by achternaam,roepnaam)"));
@@ -774,7 +766,6 @@ int main(int argc, char** argv)
 
   sws.wrapGet({}, "/oods.html", [&tp](auto& cr) {
     nlohmann::json data;
-    data["og"]["title"] = "Alle open.overheid.nl documenten";
     data["og"]["description"] = "Alle open.overheid.nl documenten";
 
     /*
@@ -900,7 +891,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
     
-    data["og"]["title"] = "Toezegging "+nummer;
     data["og"]["description"] = eget(toez[0], "tekst");
     data["toez"]=packResultsJson(toez)[0];
     if(data["toez"]["pnummer"] != "")
@@ -984,7 +974,6 @@ int main(int argc, char** argv)
     }
     z["adocs"] = adocs;
     // XXX agendapunt multi
-    z["og"]["title"] = "Zaak " + nummer+" | " +  eget(zaken[0], "onderwerp");
     z["og"]["description"] = "Zaak " + eget(zaken[0], "titel") + " | " + eget(zaken[0], "onderwerp");
 
     inja::Environment e;
@@ -1146,7 +1135,6 @@ int main(int argc, char** argv)
       if(!q.empty())
 	data["data"] = packResultsJson(tp.getLease()->queryT(q));
       
-      data["og"]["title"] = name;
       data["og"]["description"] = name;
 
       res.set_content(e.render_file("./partials/"+file, data), "text/html");
@@ -1237,7 +1225,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
 
-    data["og"]["title"] = "Recente documenten";
     data["og"]["description"] = "Recente documenten uit de Tweede Kamer";
     
     res.set_content(e.render_file("./partials/index.html", data), "text/html");
@@ -1308,7 +1295,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
     nlohmann::json data;
-    data["og"]["title"] = "OpenTK - Toezeggingen";
     data["og"]["description"] = "Toezeggingen van het kabinet";
     data["data"] = filtered;
     data["voortouw"] = commissie;
@@ -1460,7 +1446,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
 
-    data["og"]["title"] = "Open vragen";
     data["og"]["description"] = "Open vragen uit de Tweede Kamer";
 
     res.set_content(e.render_file("./partials/open-vragen.html", data), "text/html");
@@ -1518,7 +1503,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
 
-    data["og"]["title"] = "Recente en toekomstige besluiten";
     data["og"]["description"] = "Recente en toekomstige besluiten in de Tweede Kamer";
     
     res.set_content(e.render_file("./partials/besluiten.html", data), "text/html");
@@ -1538,7 +1522,7 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
 
-    data["og"]["title"] = act[0]["onderwerp"];
+    data["onderwerp"] = act[0]["onderwerp"];
     data["og"]["description"] = (string)act[0]["datum"] + ": "+ (string)act[0]["onderwerp"];
     
     res.set_content(e.render_file("./partials/activiteit.html", data), "text/html");
@@ -1602,7 +1586,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(false); // NOTE WELL!
 
-    data["og"]["title"] = "Activiteiten";
     data["og"]["description"] = "Activiteiten Tweede Kamer";
     
     res.set_content(e.render_file("./partials/activiteiten.html", data), "text/html");
@@ -1645,7 +1628,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(false); // NOTE WELL!
 
-    data["og"]["title"] = "Ongeplande activiteiten";
     data["og"]["description"] = "Ongeplande activiteiten Tweede Kamer";
 
     res.set_content(e.render_file("./partials/ongeplande-activiteiten.html", data), "text/html");
@@ -1664,7 +1646,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
     nlohmann::json data;
-    data["og"]["title"] = eget(deets[0], "naam");
     data["og"]["description"] = eget(deets[0], "naam");
 
     data["id"] = id;
@@ -1692,7 +1673,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
 
-    data["og"]["title"] = docs[0]["titel"];
     data["og"]["description"] = docs[0]["titel"];
     
     res.set_content(e.render_file("./partials/ksd.html", data), "text/html");
@@ -1897,7 +1877,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(false);
 
-    data["og"]["title"] = get<string>(ret[0]["onderwerp"]);
     data["og"]["description"] = get<string>(ret[0]["titel"]) + " " +get<string>(ret[0]["onderwerp"]);
 
     bulkEscape(data); 
@@ -1977,7 +1956,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(false); // XX 
 
-    data["og"]["title"] = (string)data["titel"];
     data["og"]["description"] = (string)data["updated"] + " " + (string)data["titel"];
 
     bulkEscape(data); 
@@ -2024,7 +2002,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(false); // XX 
 
-    data["og"]["title"] = (string)data["titel"];
     data["og"]["description"] = (string)data["mutatiedatumtijd"] + " " + (string)data["titel"];
 
     bulkEscape(data); 
@@ -2039,7 +2016,6 @@ int main(int argc, char** argv)
     e.set_html_autoescape(true);
     nlohmann::json data;
     data["recenteVerslagen"] = packResultsJson(tmp);
-    data["og"]["title"] = "Recente verslagen";
     data["og"]["description"] = "Recente verslagen uit de Tweede Kamer";
     
     res.set_content(e.render_file("./partials/verslagen.html", data), "text/html");
@@ -2115,7 +2091,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true); 
 
-    data["og"]["title"] = "Stemmingen";
     data["og"]["description"] = "Stemmingen";
 
     res.set_content(e.render_file("./partials/stemmingen.html", data), "text/html");
@@ -2312,11 +2287,11 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
     nlohmann::json data;
-    data["og"]["title"] = fmt::format("Error {} {} @ {}", res.status, httplib::status_message(res.status), time(0));
-    data["error"] = data["og"]["title"];
+    string error = fmt::format("Error {} {} @ {}", res.status, httplib::status_message(res.status), time(0));
+    data["error"] = error;
       
-    data["og"]["description"] = "Een TKConv error: " + (string)data["error"];
-    cout<<"Error: "<<req.path<<" '"<< (string)data["error"] <<"'"<<endl;
+    data["og"]["description"] = "Een TKConv error: " + error;
+    cout<<"Error: "<<req.path<<" '"<< error <<"'"<<endl;
     res.set_content(e.render_file("./partials/error.html", data), "text/html");
   });
   

From 25ef87ee632baf1a98a6e90557680ded916084e5 Mon Sep 17 00:00:00 2001
From: Wander Nauta <info@wandernauta.nl>
Date: Sun, 24 May 2026 16:28:14 +0200
Subject: [PATCH 6/6] move og.description computation to partials

---
 partials/activiteit.html              |  1 +
 partials/activiteiten.html            |  1 +
 partials/base.html                    |  3 +--
 partials/besluiten.html               |  1 +
 partials/commissie.html               |  1 +
 partials/error.html                   |  1 +
 partials/getorig.html                 |  1 +
 partials/index.html                   |  1 +
 partials/kamerstukdossiers.html       |  1 +
 partials/ksd.html                     |  1 +
 partials/mijn.html                    |  1 +
 partials/ongeplande-activiteiten.html |  1 +
 partials/oo.html                      |  1 +
 partials/oods.html                    |  1 +
 partials/open-vragen.html             |  1 +
 partials/personen.html                |  1 +
 partials/persoon.html                 |  4 +++
 partials/search.html                  |  1 +
 partials/stemmingen.html              |  1 +
 partials/toezegging.html              |  1 +
 partials/toezeggingen.html            |  1 +
 partials/verslag.html                 |  1 +
 partials/verslagen.html               |  1 +
 partials/zaak.html                    |  1 +
 tkserv.cc                             | 38 +--------------------------
 25 files changed, 28 insertions(+), 39 deletions(-)

diff --git a/partials/activiteit.html b/partials/activiteit.html
index aeb48c2..e86eaf7 100644
--- a/partials/activiteit.html
+++ b/partials/activiteit.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block title %}Activiteit{% endblock %}
 {% block og.title %}{{ onderwerp }}{% endblock %}
+{% block og.description %}{{ datum }}: {{ onderwerp }}{% endblock %}
 
 {% block div %}
 id="recent-docs" x-data="{
diff --git a/partials/activiteiten.html b/partials/activiteiten.html
index 48dfe23..20dd6c7 100644
--- a/partials/activiteiten.html
+++ b/partials/activiteiten.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block title %}Activiteiten{% endblock %}
 {% block og.title %}Activiteiten{% endblock %}
+{% block og.description %}Activiteiten Tweede Kamer{% endblock %}
 
 {% block main %}
 <h4>Recente en toekomstige activiteiten
diff --git a/partials/base.html b/partials/base.html
index be0c456..20faa06 100644
--- a/partials/base.html
+++ b/partials/base.html
@@ -4,9 +4,8 @@
     <title>{% block title %}{% endblock %} – OpenTK</title>
     <meta charset="utf-8">
     <meta property='og:title' content='{% block og.title %}{% endblock %}'>
-    <meta property='og:description' content='{{ og.description }}'>
+    <meta property='og:description' content='{% block og.description %}{% endblock %}'>
     <meta property='og:type' content='article'>
-    <meta property='og:image' content='{{default(og.imageurl,"")}}'>
     {% block extrameta %} {% endblock %}
     <link rel='stylesheet' href='pico.min.css' />
     <style>
diff --git a/partials/besluiten.html b/partials/besluiten.html
index 974d162..2495372 100644
--- a/partials/besluiten.html
+++ b/partials/besluiten.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block title %}Besluiten{% endblock %}
 {% block og.title %}Recente en toekomstige besluiten{% endblock %}
+{% block og.description %}Recente en toekomstige besluiten in de Tweede Kamer{% endblock %}
 
 {% block main %}
 <h4>Recente en toekomstige besluiten</h4>
diff --git a/partials/commissie.html b/partials/commissie.html
index 53bbd04..57576a7 100644
--- a/partials/commissie.html
+++ b/partials/commissie.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block title %}{{ naam }}{% endblock %}
 {% block og.title %}{{ naam }}{% endblock %}
+{% block og.description %}{{ naam }}{% endblock %}
 
 {% block javascript %}
 <script defer src="user.js"></script>
diff --git a/partials/error.html b/partials/error.html
index 70a4f0c..05b2cfe 100644
--- a/partials/error.html
+++ b/partials/error.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block title %}Error{% endblock %}
 {% block og.title %}{{ error }}{% endblock %}
+{% block og.description %}Een TKConv error: {{ error }}{% endblock %}
 
 {% block main %}
 <hr>
diff --git a/partials/getorig.html b/partials/getorig.html
index f8299e4..7f72f10 100644
--- a/partials/getorig.html
+++ b/partials/getorig.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block title %}{{ meta.onderwerp }}{% endblock %}
 {% block og.title %}{{ meta.onderwerp }}{% endblock %}
+{% block og.description %}{{ meta.titel }} {{ meta.onderwerp }}{% endblock %}
 
 {% block javascript %}
 <script defer src="user.js"></script>
diff --git a/partials/index.html b/partials/index.html
index 6f969de..1611c65 100644
--- a/partials/index.html
+++ b/partials/index.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block title %}Hoofdpagina{% endblock %}
 {% block og.title %}Recente documenten{% endblock %}
+{% block og.description %}Recente documenten uit de Tweede Kamer{% endblock %}
 
 {% block extrameta %}
 <link rel="alternate" type="application/rss+xml" href="https://berthub.eu/tkconv/index.xml" title="OpenTK Meest recente parlementaire documenten" />
diff --git a/partials/kamerstukdossiers.html b/partials/kamerstukdossiers.html
index 01a01af..3eae57a 100644
--- a/partials/kamerstukdossiers.html
+++ b/partials/kamerstukdossiers.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Kamerstukdossiers{% endblock %}
+{% block og.title %}Kamerstukdossiers{% endblock %}
 
 {% block div %}
 x-data="{  kamerstukdossiers: []  }" x-init="getGenKSD('recent-kamerstukdossiers', 'kamerstukdossiers', $data);"
diff --git a/partials/ksd.html b/partials/ksd.html
index 7ff84ad..9a740a3 100644
--- a/partials/ksd.html
+++ b/partials/ksd.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block title %}{{ meta.titel }}{% endblock %}
 {% block og.title %}{{ meta.titel }}{% endblock %}
+{% block og.description %}{{ meta.titel }}{% endblock %}
 
 {% block javascript %}
 <script defer src="user.js"></script>
diff --git a/partials/mijn.html b/partials/mijn.html
index e3647ae..d7b0015 100644
--- a/partials/mijn.html
+++ b/partials/mijn.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block title %}Mijn{% endblock %}
 {% block og.title %}Mijn{% endblock %}
+{% block og.description %}Mijn{% endblock %}
 
 {% block div %}
 id="recent-docs" x-data='{
diff --git a/partials/ongeplande-activiteiten.html b/partials/ongeplande-activiteiten.html
index c8faf75..483b359 100644
--- a/partials/ongeplande-activiteiten.html
+++ b/partials/ongeplande-activiteiten.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block title %}Ongeplande activiteiten{% endblock %}
 {% block og.title %}Ongeplande activiteiten{% endblock %}
+{% block og.description %}Ongeplande activiteiten Tweede Kamer{% endblock %}
 
 {% block main %}
 <h4>Nog ongeplande activiteiten
diff --git a/partials/oo.html b/partials/oo.html
index c222c38..2e3ff6d 100644
--- a/partials/oo.html
+++ b/partials/oo.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block title %}{{ titel }}{% endblock %}
 {% block og.title %}{{ titel }}{% endblock %}
+{% block og.description %}{{ mutatiedatumtijd }} {{ titel }}{% endblock %}
 
 {% block main %}
 <hgroup>
diff --git a/partials/oods.html b/partials/oods.html
index b13fee8..7f48483 100644
--- a/partials/oods.html
+++ b/partials/oods.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block title %}Alle open.overheid.nl documenten{% endblock %}
 {% block og.title %}Alle open.overheid.nl documenten{% endblock %}
+{% block og.description %}Alle open.overheid.nl documenten{% endblock %}
 
 {% block div %}
 x-data="{
diff --git a/partials/open-vragen.html b/partials/open-vragen.html
index ba080e9..29e9780 100644
--- a/partials/open-vragen.html
+++ b/partials/open-vragen.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block title %}Open vragen{% endblock %}
 {% block og.title %}Open vragen{% endblock %}
+{% block og.description %}Open vragen uit de Tweede Kamer{% endblock %}
 
 {% block customheader %}
 <p>{{ aantalvragen }} open vragen, in {{ length(openVragen) }} documenten (waarvan <font color="#ff0000">{{ totlaatzonderuitstel }}</font> te laat zonder uitstel)</p>
diff --git a/partials/personen.html b/partials/personen.html
index f00c6e0..3e8243d 100644
--- a/partials/personen.html
+++ b/partials/personen.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block title %}Alle personen{% endblock %}
 {% block og.title %}Alle personen{% endblock %}
+{% block og.description %}Alle personen{% endblock %}
 
 {% block main %}
 <h4>Kamerleden en veel voormalige kamerleden</h4>
diff --git a/partials/persoon.html b/partials/persoon.html
index 4573bf7..f2a02fb 100644
--- a/partials/persoon.html
+++ b/partials/persoon.html
@@ -1,6 +1,10 @@
 {% extends "base.html" %}
 {% block title %}Kamerlid{% endblock %}
 {% block og.title %}{{meta.roepnaam}} {% if meta.tussenvoegsel != "" %}{{meta.tussenvoegsel}} {% endif %}{{meta.achternaam}}{% endblock %}
+{% block og.description %}{{meta.functie}}{% endblock %}
+{% block extrameta %}
+    <meta property='og:image' content='https://berthub.eu/tkconv/personphoto/{{meta.nummer}}'>
+{% endblock %}
 
 {% block div %}
 x-data="{
diff --git a/partials/search.html b/partials/search.html
index edc0106..69e2e6a 100644
--- a/partials/search.html
+++ b/partials/search.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block title %}{% if h != "" %}Zoek naar {{h}}{% else %}Zoeken{% endif %}{% endblock %}
 {% block og.title %}{% if h != "" %}Zoek naar {{h}}{% else %}Zoeken{% endif %}{% endblock %}
+{% block og.description %}{% if h != "" %}Zoek naar {{h}}{% else %}Zoeken{% endif %}{% endblock %}
 
 {% block div %}
 x-data="{
diff --git a/partials/stemmingen.html b/partials/stemmingen.html
index e79e53a..544c5aa 100644
--- a/partials/stemmingen.html
+++ b/partials/stemmingen.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block title %}Stemmingen{% endblock %}
 {% block og.title %}Stemmingen{% endblock %}
+{% block og.description %}Stemmingen{% endblock %}
 
 {% block main %}
 <h4>Recente stemmingen (afgelopen {{weken}} weken)</h4>
diff --git a/partials/toezegging.html b/partials/toezegging.html
index dc3b06f..c247237 100644
--- a/partials/toezegging.html
+++ b/partials/toezegging.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block title %}Toezegging {{toez.tnummer}}{% endblock %}
 {% block og.title %}Toezegging {{toez.tnummer}}{% endblock %}
+{% block og.description %}{{toez.tekst}}{% endblock %}
 
 {% block customheader %}
 <p></p>
diff --git a/partials/toezeggingen.html b/partials/toezeggingen.html
index 6e4a07f..9d42c73 100644
--- a/partials/toezeggingen.html
+++ b/partials/toezeggingen.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block title %}Toezeggingen{% endblock %}
 {% block og.title %}Toezeggingen{% endblock %}
+{% block og.description %}Toezeggingen van het kabinet{% endblock %}
 
 {% block div %}
 x-data="{
diff --git a/partials/verslag.html b/partials/verslag.html
index dc9ea23..78d2f72 100644
--- a/partials/verslag.html
+++ b/partials/verslag.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block title %}{{titel}}{% endblock %}
 {% block og.title %}{{titel}}{% endblock %}
+{% block og.description %}{{updated}} {{titel}}{% endblock %}
 
 {% block customheader %}
 <h5>Datum {{datum}}. Laatste update: {{updated}}</h5>
diff --git a/partials/verslagen.html b/partials/verslagen.html
index 08feaca..fd4752e 100644
--- a/partials/verslagen.html
+++ b/partials/verslagen.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block title %}Verslagen{% endblock %}
 {% block og.title %}Recente verslagen{% endblock %}
+{% block og.description %}Recente verslagen uit de Tweede Kamer{% endblock %}
 
 {% block main %}
 <h4>Verslagen</h4>
diff --git a/partials/zaak.html b/partials/zaak.html
index 7190cbe..710aeee 100644
--- a/partials/zaak.html
+++ b/partials/zaak.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block title %}Zaak {{zaak.nummer}}{% endblock %}
 {% block og.title %}Zaak {{zaak.nummer} | {{zaak.onderwerp}}{% endblock %}
+{% block og.description %}Zaak {{zaak.nummer} | {{zaak.onderwerp}}{% endblock %}
 
 {% block div %}
 x-data="{
diff --git a/tkserv.cc b/tkserv.cc
index 07cc9be..e5e1c98 100644
--- a/tkserv.cc
+++ b/tkserv.cc
@@ -705,9 +705,6 @@ int main(int argc, char** argv)
 
     j["openvragen"] = packResultsJson(sqlw->queryT("select substr(openvragen.gestartOp, 0, 11) sdatum, aantal, openvragen.* from openvragen,zaakactor,zaak,persoon left join SchriftelijkeVraagStat on SchriftelijkeVraagStat.documentNummer = openvragen.docunummer  where persoon.id=persoonid and zaak.id = openvragen.id and zaak.id = zaakactor.zaakid and relatie='Indiener' and persoon.id=? order by sdatum asc", {persoonId}));
 
-    j["og"]["description"] = (string)lid[0]["functie"];
-    j["og"]["imageurl"] = "https://berthub.eu/tkconv/personphoto/"+to_string(nummer);
-
     inja::Environment e;
     e.set_html_autoescape(true);
     
@@ -717,7 +714,6 @@ int main(int argc, char** argv)
 
   sws.wrapGet({}, "/mijn.html", [&tp](auto& cr) {
     nlohmann::json data;
-    data["og"]["description"] = "Mijn";
 
     inja::Environment e;
     e.set_html_autoescape(true);
@@ -736,7 +732,6 @@ int main(int argc, char** argv)
   sws.wrapGet({}, "/search.html", [&tp](auto& cr) {
     string q = cr.req.get_param_value("q");
     nlohmann::json data;
-    data["og"]["description"] = "Zoek naar "+htmlEscape(q);
     data["q"] = urlEscape(q);
     data["h"] = htmlEscape(q);
     inja::Environment e;
@@ -748,7 +743,6 @@ int main(int argc, char** argv)
 
   sws.wrapGet({}, "/personen.html", [&tp](auto& cr) {
     nlohmann::json data;
-    data["og"]["description"] = "Alle personen";
 
     auto personen = packResultsJson(tp.getLease()->queryT(R"(select min(van) voorheteerst, titels, persoon.nummer, roepnaam,tussenvoegsel,achternaam,json_group_array(distinct(afkorting)) fracties from persoon,fractiezetelpersoon,fractiezetel,fractie where  fractiezetelpersoon.persoonid = persoon.id and fractiezetelpersoon.fractiezetelid = fractiezetel.id and fractie.id=fractiezetel.fractieid group by persoon.id order by achternaam,roepnaam)"));
 
@@ -766,7 +760,6 @@ int main(int argc, char** argv)
 
   sws.wrapGet({}, "/oods.html", [&tp](auto& cr) {
     nlohmann::json data;
-    data["og"]["description"] = "Alle open.overheid.nl documenten";
 
     /*
       Selection criteria:
@@ -891,7 +884,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
     
-    data["og"]["description"] = eget(toez[0], "tekst");
     data["toez"]=packResultsJson(toez)[0];
     if(data["toez"]["pnummer"] != "")
       data["toez"]["pfractie"] = getPartyFromNumber(sqlw.get(), (int)data["toez"]["pnummer"]);
@@ -974,7 +966,6 @@ int main(int argc, char** argv)
     }
     z["adocs"] = adocs;
     // XXX agendapunt multi
-    z["og"]["description"] = "Zaak " + eget(zaken[0], "titel") + " | " + eget(zaken[0], "onderwerp");
 
     inja::Environment e;
     e.set_html_autoescape(true);
@@ -1135,8 +1126,6 @@ int main(int argc, char** argv)
       if(!q.empty())
 	data["data"] = packResultsJson(tp.getLease()->queryT(q));
       
-      data["og"]["description"] = name;
-
       res.set_content(e.render_file("./partials/"+file, data), "text/html");
     });
   };
@@ -1225,8 +1214,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
 
-    data["og"]["description"] = "Recente documenten uit de Tweede Kamer";
-    
     res.set_content(e.render_file("./partials/index.html", data), "text/html");
   });
 
@@ -1295,7 +1282,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
     nlohmann::json data;
-    data["og"]["description"] = "Toezeggingen van het kabinet";
     data["data"] = filtered;
     data["voortouw"] = commissie;
     data["fractie"] = fractie;
@@ -1446,8 +1432,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
 
-    data["og"]["description"] = "Open vragen uit de Tweede Kamer";
-
     res.set_content(e.render_file("./partials/open-vragen.html", data), "text/html");
   });
 
@@ -1503,8 +1487,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
 
-    data["og"]["description"] = "Recente en toekomstige besluiten in de Tweede Kamer";
-    
     res.set_content(e.render_file("./partials/besluiten.html", data), "text/html");
   });
   
@@ -1522,8 +1504,7 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
 
-    data["onderwerp"] = act[0]["onderwerp"];
-    data["og"]["description"] = (string)act[0]["datum"] + ": "+ (string)act[0]["onderwerp"];
+    data = act[0];
     
     res.set_content(e.render_file("./partials/activiteit.html", data), "text/html");
   });
@@ -1586,8 +1567,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(false); // NOTE WELL!
 
-    data["og"]["description"] = "Activiteiten Tweede Kamer";
-    
     res.set_content(e.render_file("./partials/activiteiten.html", data), "text/html");
   });
 
@@ -1628,8 +1607,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(false); // NOTE WELL!
 
-    data["og"]["description"] = "Ongeplande activiteiten Tweede Kamer";
-
     res.set_content(e.render_file("./partials/ongeplande-activiteiten.html", data), "text/html");
   });
 
@@ -1646,7 +1623,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
     nlohmann::json data;
-    data["og"]["description"] = eget(deets[0], "naam");
 
     data["id"] = id;
     data["naam"] = eget(deets[0], "naam");
@@ -1673,8 +1649,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true);
 
-    data["og"]["description"] = docs[0]["titel"];
-    
     res.set_content(e.render_file("./partials/ksd.html", data), "text/html");
   });
   
@@ -1877,8 +1851,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(false);
 
-    data["og"]["description"] = get<string>(ret[0]["titel"]) + " " +get<string>(ret[0]["onderwerp"]);
-
     bulkEscape(data); 
 
     if(!externeid.empty() && haveExternalIdFile(externeid)) {
@@ -1956,8 +1928,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(false); // XX 
 
-    data["og"]["description"] = (string)data["updated"] + " " + (string)data["titel"];
-
     bulkEscape(data); 
     data["htmlverslag"]=enrichHTML(getHtmlForDocument(data["id"], true), tp.getLease().get());
     res.set_content(e.render_file("./partials/verslag.html", data), "text/html");
@@ -2002,8 +1972,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(false); // XX 
 
-    data["og"]["description"] = (string)data["mutatiedatumtijd"] + " " + (string)data["titel"];
-
     bulkEscape(data); 
     //    data["htmlverslag"]="";
     res.set_content(e.render_file("./partials/oo.html", data), "text/html");
@@ -2016,7 +1984,6 @@ int main(int argc, char** argv)
     e.set_html_autoescape(true);
     nlohmann::json data;
     data["recenteVerslagen"] = packResultsJson(tmp);
-    data["og"]["description"] = "Recente verslagen uit de Tweede Kamer";
     
     res.set_content(e.render_file("./partials/verslagen.html", data), "text/html");
   });
@@ -2091,8 +2058,6 @@ int main(int argc, char** argv)
     inja::Environment e;
     e.set_html_autoescape(true); 
 
-    data["og"]["description"] = "Stemmingen";
-
     res.set_content(e.render_file("./partials/stemmingen.html", data), "text/html");
   });
 
@@ -2290,7 +2255,6 @@ int main(int argc, char** argv)
     string error = fmt::format("Error {} {} @ {}", res.status, httplib::status_message(res.status), time(0));
     data["error"] = error;
       
-    data["og"]["description"] = "Een TKConv error: " + error;
     cout<<"Error: "<<req.path<<" '"<< error <<"'"<<endl;
     res.set_content(e.render_file("./partials/error.html", data), "text/html");
   });