diff --git a/.gitignore b/.gitignore
index d758e36..7ff995e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ node_modules/
 .env
 AGENTS.md
 diensten/
+diensten_*/
diff --git a/src/dienstService.js b/src/dienstService.js
index bdf5483..11ef8f0 100644
--- a/src/dienstService.js
+++ b/src/dienstService.js
@@ -33,7 +33,7 @@ function loadDiensten() {
 
 function findDienst(dienstnummer) {
   const diensten = loadDiensten()
-  return diensten.find(d => d.dienstnummer === dienstnummer) || null
+  return diensten.find(d => String(d.dienstnummer) === dienstnummer) || null
 }
 
 function getPngFilePaths(dienst) {
diff --git a/src/messageHandler.js b/src/messageHandler.js
index 1fd2345..8a9d280 100644
--- a/src/messageHandler.js
+++ b/src/messageHandler.js
@@ -6,7 +6,7 @@ const { increment: incrementDaily } = require('./dailyStats')
 const ALLOWED_GROUP = process.env.ALLOWED_GROUP
 
 function extractDienstnummer(body) {
-  const match = body.match(/^\s*(\d{4})\s*$/)
+  const match = body.match(/^\s*(\d{4,5})\s*$/)
   return match ? match[1] : null
 }
 
@@ -66,4 +66,4 @@ async function handleWebhook(payload) {
   }
 }
 
-module.exports = { handleWebhook }
+module.exports = { handleWebhook, extractDienstnummer }