diff --git a/CHANGELOG.md b/CHANGELOG.md
index f44e8e2..63e71ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,18 @@
 ```
 drc restart migrations-triggering-indexing && drc logs -ft --tail=200 migrations-triggering-indexing
 ```
+
+## 1.28.5 (2025-01-23)
+### Frontend
+- Bump to [v1.28.3](https://github.com/lblod/frontend-organization-portal/releases/tag/v1.28.3)
+### Backend
+- Datafix: correct merger change events for worship organisations (OP-3534)
+- Avoid municipality filter to include partial matches (OP-3509)
+### Deploy notes
+- `drc restart migrations-triggering-indexing; drc logs -ft --tail=200 migrations-triggering-indexing`
+- `drc pull frontend; drc up -d frontend`
+- Perform a full re-index by executing `./scripts/reset-elastic.sh`
+
 ## 1.28.4 (2025-01-16)
 ### Backend
 #### Data
diff --git a/config/migrations-triggering-indexing/20250114093158-fix-merger-change-event-sint_martinus-st_amandus.sparql b/config/migrations-triggering-indexing/20250114093158-fix-merger-change-event-sint_martinus-st_amandus.sparql
new file mode 100644
index 0000000..cafa7f5
--- /dev/null
+++ b/config/migrations-triggering-indexing/20250114093158-fix-merger-change-event-sint_martinus-st_amandus.sparql
@@ -0,0 +1,23 @@
+PREFIX regorg: <http://www.w3.org/ns/regorg#>
+PREFIX org: <http://www.w3.org/ns/org#>
+
+DELETE {
+  GRAPH <http://mu.semte.ch/graphs/worship-service> {
+    ?stAmandus regorg:orgStatus ?oldStatus.
+  }
+} INSERT {
+  GRAPH <http://mu.semte.ch/graphs/worship-service> {
+    ?stAmandus regorg:orgStatus ?notActiveStatus.
+
+    ?mergerChangeEvent org:originalOrganization ?stAmandus.
+  }
+} WHERE {
+  GRAPH <http://mu.semte.ch/graphs/worship-service> {
+    ?stAmandus regorg:orgStatus ?oldStatus.
+  }
+  VALUES ?stAmandus {
+    <http://data.lblod.info/id/besturenVanDeEredienst/b18a5d3943087d509d76dcceeba102c3>
+  }
+  BIND (<http://data.lblod.info/id/veranderingsgebeurtenissen/677E445E29299CC832892A0F> AS ?mergerChangeEvent)
+  BIND (<http://lblod.data.gift/concepts/d02c4e12bf88d2fdf5123b07f29c9311> AS ?notActiveStatus)
+}
diff --git a/config/search/config.json b/config/search/config.json
index 643458d..3a5d67e 100644
--- a/config/search/config.json
+++ b/config/search/config.json
@@ -223,7 +223,7 @@
             }
           },
           "organization_municipality": {
-            "type": "text",
+            "type": "keyword",
             "fields": {
               "field": {
                 "type": "keyword",
@@ -385,7 +385,7 @@
             }
           },
           "organization_municipality": {
-            "type": "text",
+            "type": "keyword",
             "fields": {
               "field": {
                 "type": "keyword",
@@ -540,7 +540,7 @@
             }
           },
           "organization_municipality": {
-            "type": "text",
+            "type": "keyword",
             "fields": {
               "field": {
                 "type": "keyword",
@@ -727,7 +727,7 @@
             }
           },
           "organization_municipality": {
-            "type": "text",
+            "type": "keyword",
             "fields": {
               "field": {
                 "type": "keyword",
@@ -880,7 +880,7 @@
             }
           },
           "municipality": {
-            "type": "text",
+            "type": "keyword",
             "fields": {
               "field": {
                 "type": "keyword",
diff --git a/config/search/dev/config.json b/config/search/dev/config.json
index bdb3394..ab1902c 100644
--- a/config/search/dev/config.json
+++ b/config/search/dev/config.json
@@ -195,7 +195,7 @@
             }
           },
           "organization_municipality": {
-            "type": "text",
+            "type": "keyword",
             "fields": {
               "field": {
                 "type": "keyword",
@@ -357,7 +357,7 @@
             }
           },
           "organization_municipality": {
-            "type": "text",
+            "type": "keyword",
             "fields": {
               "field": {
                 "type": "keyword",
@@ -512,7 +512,7 @@
             }
           },
           "organization_municipality": {
-            "type": "text",
+            "type": "keyword",
             "fields": {
               "field": {
                 "type": "keyword",
@@ -700,7 +700,7 @@
             }
           },
           "organization_municipality": {
-            "type": "text",
+            "type": "keyword",
             "fields": {
               "field": {
                 "type": "keyword",
@@ -853,7 +853,7 @@
             }
           },
           "municipality": {
-            "type": "text",
+            "type": "keyword",
             "fields": {
               "field": {
                 "type": "keyword",
diff --git a/docker-compose.yml b/docker-compose.yml
index 28e39cb..7bafdc4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -188,7 +188,7 @@ services:
     restart: always
     logging: *default-logging
   frontend:
-    image: lblod/frontend-organization-portal:1.28.0
+    image: lblod/frontend-organization-portal:1.28.3
     volumes:
       - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf
     environment: