diff --git a/VEST/vest.sql b/VEST/vest.sql
index ff8507bcf..cf56af545 100644
--- a/VEST/vest.sql
+++ b/VEST/vest.sql
@@ -1366,14 +1366,8 @@ AS
      
 CREATE OR REPLACE VIEW vest_v_rap_lunch
 AS
-    SELECT (SELECT fac.safe_to_date(mk.mld_kenmerkmelding_waarde, 'DD-MM-YYYY')
-              FROM mld_kenmerkmelding mk
-             WHERE     mk.mld_melding_key = m.mld_melding_key
-                   AND mk.mld_kenmerk_key = 621)    datum,
-           (SELECT fac.safe_to_date(mk.mld_kenmerkmelding_waarde, 'HH:MI')
-              FROM mld_kenmerkmelding mk
-             WHERE     mk.mld_melding_key = m.mld_melding_key
-                   AND mk.mld_kenmerk_key = 622)    tijd,
+    SELECT     m.mld_melding_einddatum datum,
+           m.mld_melding_einddatum tijd,
            m.mld_melding_key                        nummer,
            (SELECT mk.mld_kenmerkmelding_waarde
               FROM mld_kenmerkmelding mk