diff --git a/RWSN/rwsn.sql b/RWSN/rwsn.sql
index 9f945c70c..e43c0c08a 100644
--- a/RWSN/rwsn.sql
+++ b/RWSN/rwsn.sql
@@ -22710,8 +22710,8 @@ AS
           AND kd.ins_deel_key = d.ins_deel_key
           AND d.ins_alg_ruimte_key_org IS NOT NULL               -- Uitgeleend
           AND d.ins_alg_ruimte_type = 'P'
-          AND fac.safe_to_date (kd.ins_kenmerkdeel_waarde, 'dd-mm-yyyy') > SYSDATE - 1
-          AND MOD (fac.count_work_days (fac.safe_to_date (kd.ins_kenmerkdeel_waarde, 'dd-mm-yyyy'), SYSDATE - 1), 7) = 0
+          AND fac.safe_to_date (kd.ins_kenmerkdeel_waarde, 'dd-mm-yyyy') - 7 < SYSDATE
+          AND MOD (fac.safe_to_date (kd.ins_kenmerkdeel_waarde, 'dd-mm-yyyy') - TRUNC (SYSDATE), 7) = 0
           AND sn.fac_srtnotificatie_code = 'CUST09';
 
 -- RWSN#30460
@@ -24845,7 +24845,7 @@ AS
       SELECT MIN(i.ebf_gegevens_eco)   fclt_xas_, COUNT(wi.ebf_gegevens_eco)   fclt_yas_, 21 fclt_sort FROM wi, rwsn_v_issues i);
 
 -- RWSN#33267 [T=3801/WORK=3321] => P=3250
-/* Formatted on 17-11-2015 19:04:10 (QP5 v5.136.908.31019) */
+/* Formatted on 1-2-2016 13:42:24 (QP5 v5.136.908.31019) */
 CREATE OR REPLACE VIEW rwsn_v_wpbez
 (
    locatie_key,
@@ -24880,12 +24880,12 @@ AS
           COALESCE (wp_tot.aantal, 0) wp_tot,
           COALESCE (wp_bez.aantal, 0) wp_bez,
           COALESCE (wp_tot.aantal, 0) - COALESCE (wp_bez.aantal, 0) wp_onb,
-          DECODE (wp_tot.aantal, 0, NULL, wp_bez.aantal / wp_tot.aantal)
+          DECODE (wp_tot.aantal, 0, TO_NUMBER (NULL), wp_bez.aantal / wp_tot.aantal)
              wp_bezpct,
           DECODE (
              COALESCE (wp_tot.aantal, 0),
              0,
-             NULL,
+             TO_NUMBER (NULL),
              (wp_tot.aantal - COALESCE (wp_bez.aantal, 0)) / wp_tot.aantal)
              wp_onbpct
      FROM (SELECT DISTINCT v.alg_verdieping_key,
@@ -24960,12 +24960,12 @@ AS
           COALESCE (wp_tot.aantal, 0) wp_tot,
           COALESCE (wp_bez.aantal, 0) wp_bez,
           COALESCE (wp_tot.aantal, 0) - COALESCE (wp_bez.aantal, 0) wp_onb,
-          DECODE (wp_tot.aantal, 0, NULL, wp_bez.aantal / wp_tot.aantal)
+          DECODE (wp_tot.aantal, 0, TO_NUMBER (NULL), wp_bez.aantal / wp_tot.aantal)
              wp_bezpct,
           DECODE (
              COALESCE (wp_tot.aantal, 0),
              0,
-             NULL,
+             TO_NUMBER (NULL),
              (wp_tot.aantal - COALESCE (wp_bez.aantal, 0)) / wp_tot.aantal)
              wp_onbpct
      FROM (SELECT v.alg_verdieping_key,
@@ -25008,6 +25008,73 @@ AS
                      GROUP BY r.alg_verdieping_key) wp_bez   -- Per verdieping
              ON x.alg_verdieping_key = wp_bez.alg_verdieping_key;
 
+/* Formatted on 4-2-2016 14:48:12 (QP5 v5.136.908.31019) */
+CREATE OR REPLACE VIEW rwsn_v_rap_onbezet_per_ruimte
+(
+   hide_f_sortering,
+   ruimte,
+   wp_onb,
+   hide_f_verdieping_key
+)
+AS
+   SELECT TO_CHAR (alg_verdieping_key) || SUBSTR ('0000' || TO_CHAR (ABS (aantal - 1000)), -4),
+          ruimte,
+          aantal,
+          alg_verdieping_key
+     FROM (  SELECT r.alg_verdieping_key,
+                       g.alg_gebouw_code
+                    || '-'
+                    || SUBSTR ('0' || v.alg_verdieping_code, -2)
+                    || '-'
+                    || r.alg_ruimte_nr
+                       ruimte,
+                    COUNT ( * ) aantal
+               FROM ins_v_aanwezigdeel d,
+                    ins_srtdeel sd,
+                    ins_srtgroep sg,
+                    alg_v_aanwezigruimte r,
+                    alg_verdieping v,
+                    alg_gebouw g,
+                    alg_locatie l
+              WHERE     COALESCE (d.ins_deel_state, '0') != '1'  -- NU onbezet
+                    AND d.ins_deel_vervaldatum IS NULL
+                    AND d.ins_srtdeel_key = sd.ins_srtdeel_key
+                    AND sd.ins_srtgroep_key = sg.ins_srtgroep_key
+                    AND sg.ins_discipline_key = 3250                    -- WPs
+                    AND d.ins_alg_ruimte_key = r.alg_ruimte_key
+                    AND COALESCE (SUBSTR (r.alg_ruimte_upper_nr, 1, 1), 'H') =
+                          'H'
+                    AND r.alg_verdieping_key = v.alg_verdieping_key
+                    AND v.alg_gebouw_key = g.alg_gebouw_key
+                    AND g.alg_locatie_key = l.alg_locatie_key
+           GROUP BY r.alg_verdieping_key,
+                       g.alg_gebouw_code
+                    || '-'
+                    || SUBSTR ('0' || v.alg_verdieping_code, -2)
+                    || '-'
+                    || r.alg_ruimte_nr);
+
+CREATE OR REPLACE VIEW rwsn_v_rap_wpbez
+(
+   verdieping,
+   bezpct,
+   fclt_3d_gebouw_key,
+   hide_f_verdieping_key
+)
+AS
+   SELECT DISTINCT
+          gebouw_code || '/' || SUBSTR ('0' || verdieping_code, -2),
+          TO_CHAR (ROUND (DECODE (wp_tot, 0, 100, COALESCE (wp_bezpct, 0) * 100)))
+          || '% ('
+          || TO_CHAR (wp_bez)
+          || '/'
+          || TO_CHAR (wp_tot)
+          || ')',
+          gebouw_key,
+          verdieping_key
+     FROM rwsn_v_wpbez
+    WHERE COALESCE (vleugel, 'H') = 'H';
+
 -- Westraven H(oogbouw incl. vleugels A t/m E): locatie_key=82, gebouw_key=203
 /* Formatted on 11-11-2015 12:12:12 (QP5 v5.136.908.31019) */
 CREATE OR REPLACE VIEW RWSN_V_GRAPH_WPBEZ_WR_H
@@ -25114,7 +25181,7 @@ AS
 
 BEGIN adm.systrackscriptId('$Id$', 0); END;
 /
-BEGIN fac.registercustversion('RWSN', 58); END;
+BEGIN fac.registercustversion('RWSN', 59); END;
 /
 COMMIT;
 spool off