diff --git a/BVB1/bvb1.sql b/BVB1/bvb1.sql
index ec0716218..d563382f7 100644
--- a/BVB1/bvb1.sql
+++ b/BVB1/bvb1.sql
@@ -377,7 +377,7 @@ AS
         AS
             (SELECT mld_melding_key,
                     mld_melding_datum,
-                    COALESCE (mld.getmeldingstatusdate (m.mld_melding_key, 5), SYSDATE + 600)     mld_melding_afgemeld,
+                    COALESCE (mld.getmeldingstatusdate (m.mld_melding_key, 5), COALESCE(mld.getmeldingstatusdate (m.mld_melding_key, 1), SYSDATE + 600))    mld_melding_afgemeld,
                     mld_melding_einddatum_std,
                     ins_srtdiscipline_omschrijving
                FROM mld_melding        m,
@@ -386,7 +386,8 @@ AS
                     ins_srtdiscipline  sd
               WHERE     m.mld_stdmelding_key = std.mld_stdmelding_key
                     AND std.mld_ins_discipline_key = d.ins_discipline_key
-                    AND d.ins_srtdiscipline_key = sd.ins_srtdiscipline_key),
+                    AND d.ins_srtdiscipline_key = sd.ins_srtdiscipline_key
+                    AND m.fac_activiteit_key IS NULL),
         maanden
         AS
             (    SELECT LEVEL     lvl
@@ -430,9 +431,8 @@ AS
            ins_srtdiscipline_omschrijving             soortdisc,
            m.mld_melding_key
       FROM mld_melding_freezes m, maanden, startdatum sd
-     WHERE     m.mld_melding_datum < ADD_MONTHS (sd.datum, maanden.lvl - 1)
-           AND m.mld_melding_afgemeld > ADD_MONTHS (sd.datum, maanden.lvl)
-           AND mld_melding_afgemeld > mld_melding_einddatum_std;
+     WHERE     m.mld_melding_datum < ADD_MONTHS (sd.datum, maanden.lvl)
+           AND m.mld_melding_afgemeld > ADD_MONTHS (sd.datum, maanden.lvl);
 
 -- View om QR-codes bij objecten te tonen.
 CREATE OR REPLACE VIEW bvb1_v_rap_qr_deel